diff options
127 files changed, 6665 insertions, 1763 deletions
diff --git a/.gitignore b/.gitignore index 03e3393220..3e80289a16 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ lib*.a /config.log /scummvm /scummvm-static +/ScummVMDockTilePlugin* /config.h /config.mk /.gdb_history @@ -19,6 +20,7 @@ lib*.a /MT32_CONTROL.ROM /MT32_PCM.ROM /ScummVM.app +/scummvm.docktileplugin /scummvm-ps3.pkg /*.ipk /.project @@ -444,6 +444,7 @@ Other contributions Mac OS X: Max Horn - (retired) Oystein Eftevaag + Thierry Crozat Mandriva: Dominik Scherer - (retired) @@ -43,11 +43,17 @@ For a more comprehensive changelog of the latest experimental code, see: - Fixed resource releasing on game exit. - Fixed game restart after language change in-game. - Fixed flickering in main Menu. + - Fixed long save time on Windows. Windows port: - Fixed bug in MIDI device listing affecting cases where MIDI devices were not usable. + Mac OS X port: + - Dock menu for ScummVM now lists recently played games when ScummVM is + not running and allows starting those games. + - Enabled Sparkle application updater. + 1.8.0 (2016-03-04) New Games: - Added support for Rex Nebular and the Cosmic Gender Bender. diff --git a/audio/decoders/vorbis.h b/audio/decoders/vorbis.h index 2b9f6c3df9..49f770269b 100644 --- a/audio/decoders/vorbis.h +++ b/audio/decoders/vorbis.h @@ -35,6 +35,7 @@ * - sword25 * - touche * - tucker + * - wintermute */ #ifndef AUDIO_VORBIS_H diff --git a/backends/graphics/opengl/pipelines/shader.cpp b/backends/graphics/opengl/pipelines/shader.cpp index c7befe22b8..8e38458f73 100644 --- a/backends/graphics/opengl/pipelines/shader.cpp +++ b/backends/graphics/opengl/pipelines/shader.cpp @@ -28,15 +28,28 @@ namespace OpenGL { #if !USE_FORCED_GLES ShaderPipeline::ShaderPipeline(Shader *shader) - : _activeShader(shader) { + : _activeShader(shader), _colorAttributes() { _vertexAttribLocation = shader->getAttributeLocation("position"); _texCoordAttribLocation = shader->getAttributeLocation("texCoordIn"); _colorAttribLocation = shader->getAttributeLocation("blendColorIn"); + + assert(_vertexAttribLocation != -1); + assert(_texCoordAttribLocation != -1); + assert(_colorAttribLocation != -1); + + // One of the attributes needs to be passed through location 0, otherwise + // we get no output for GL contexts due to GL compatibility reasons. Let's + // check whether this ever happens. If this ever gets hit, we need to + // enable location 0 and pass some dummy values through it to fix output. + assert( _vertexAttribLocation == 0 + || _texCoordAttribLocation == 0 + || _colorAttribLocation == 0); } void ShaderPipeline::activateInternal() { GL_CALL(glEnableVertexAttribArray(_vertexAttribLocation)); GL_CALL(glEnableVertexAttribArray(_texCoordAttribLocation)); + GL_CALL(glEnableVertexAttribArray(_colorAttribLocation)); if (g_context.multitextureSupported) { GL_CALL(glActiveTexture(GL_TEXTURE0)); @@ -48,12 +61,21 @@ void ShaderPipeline::activateInternal() { void ShaderPipeline::deactivateInternal() { GL_CALL(glDisableVertexAttribArray(_vertexAttribLocation)); GL_CALL(glDisableVertexAttribArray(_texCoordAttribLocation)); + GL_CALL(glDisableVertexAttribArray(_colorAttribLocation)); _activeShader->deactivate(); } void ShaderPipeline::setColor(GLfloat r, GLfloat g, GLfloat b, GLfloat a) { - GL_CALL(glVertexAttrib4f(_colorAttribLocation, r, g, b, a)); + GLfloat *dst = _colorAttributes; + for (uint i = 0; i < 4; ++i) { + *dst++ = r; + *dst++ = g; + *dst++ = b; + *dst++ = a; + } + + GL_CALL(glVertexAttribPointer(_colorAttribLocation, 4, GL_FLOAT, GL_FALSE, 0, _colorAttributes)); } void ShaderPipeline::drawTexture(const GLTexture &texture, const GLfloat *coordinates) { diff --git a/backends/graphics/opengl/pipelines/shader.h b/backends/graphics/opengl/pipelines/shader.h index 95167ee03f..6159607099 100644 --- a/backends/graphics/opengl/pipelines/shader.h +++ b/backends/graphics/opengl/pipelines/shader.h @@ -48,6 +48,8 @@ protected: GLint _texCoordAttribLocation; GLint _colorAttribLocation; + GLfloat _colorAttributes[4*4]; + Shader *const _activeShader; }; #endif // !USE_FORCED_GLES diff --git a/backends/taskbar/macosx/dockplugin/dockplugin.m b/backends/taskbar/macosx/dockplugin/dockplugin.m new file mode 100644 index 0000000000..9d864ef2a8 --- /dev/null +++ b/backends/taskbar/macosx/dockplugin/dockplugin.m @@ -0,0 +1,125 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include <Cocoa/Cocoa.h> + +@interface ScummVMDockTilePlugIn : NSObject <NSDockTilePlugIn> { + NSMenu *recentGamesMenu; +} +@end + +@interface StartGameMenuItem : NSMenuItem { + NSString *game; +} +- (IBAction) startGame; +- (NSMenuItem*)initWithGame:(NSString *)gameId description:(NSString*)desc icon:(NSString*)iconFile; +@end + +@implementation ScummVMDockTilePlugIn + +- (id)init { + self = [super init]; + if (self) { + recentGamesMenu = nil; + } + return self; +} + +- (void)dealloc { + [recentGamesMenu release]; + [super dealloc]; +} + + +- (void)setDockTile:(NSDockTile *)dockTile { +} + +- (NSMenu*)dockMenu { + // Get the list or recent games + CFPreferencesAppSynchronize(CFSTR("org.scummvm.scummvm")); + NSArray *array = CFPreferencesCopyAppValue(CFSTR("recentGames"), CFSTR("org.scummvm.scummvm")); + if (array == nil) + return nil; + + // Create the menu + if (recentGamesMenu == nil) + recentGamesMenu = [[NSMenu alloc] init]; + else + [recentGamesMenu removeAllItems]; + + NSEnumerator *enumerator = [array objectEnumerator]; + NSDictionary *recentGame; + while (recentGame = [enumerator nextObject]) { + NSString *gameId = [recentGame valueForKey:@"game"]; + NSString *desc = [recentGame valueForKey:@"description"]; + NSString *iconFile = [recentGame valueForKey:@"icon"]; + + StartGameMenuItem *menuItem = [[StartGameMenuItem alloc] initWithGame:gameId description:desc icon:iconFile]; + [recentGamesMenu addItem:menuItem]; + [menuItem release]; + } + + return recentGamesMenu; +} + +@end + +@implementation StartGameMenuItem + +- (NSMenuItem*)initWithGame:(NSString *)gameId description:(NSString*)desc icon:(NSString*)iconFile { + self = [super initWithTitle:(desc == nil ? gameId : desc) action:@selector(startGame) keyEquivalent:@""]; + [self setTarget:self]; + + if (iconFile != nil) { + NSImage *image = [[NSImage alloc] initWithContentsOfFile:iconFile]; + [self setImage:image]; + [image release]; + } + + game = gameId; + [game retain]; + + return self; +} + +- (void)dealloc { + [game release]; + [super dealloc]; +} + +- (IBAction) startGame { + NSLog(@"Starting Game %@...", game); + + NSString *scummVMPath = [[NSWorkspace sharedWorkspace] absolutePathForAppBundleWithIdentifier:@"org.scummvm.scummvm"]; + if (scummVMPath == nil) { + NSLog(@"Cannot find ScummVM.app!"); + return; + } + // Start ScummVM.app with the game ID as argument + NSURL *url = [NSURL fileURLWithPath:scummVMPath]; + NSMutableDictionary *args = [[NSMutableDictionary alloc] init]; + [args setObject:[NSArray arrayWithObject:game] forKey:NSWorkspaceLaunchConfigurationArguments]; + [[NSWorkspace sharedWorkspace] launchApplicationAtURL:url options:NSWorkspaceLaunchDefault configuration:args error:nil]; + [args release]; +} + +@end diff --git a/backends/taskbar/macosx/macosx-taskbar.h b/backends/taskbar/macosx/macosx-taskbar.h index 5d5b9d02cd..55bb97a691 100644 --- a/backends/taskbar/macosx/macosx-taskbar.h +++ b/backends/taskbar/macosx/macosx-taskbar.h @@ -37,6 +37,7 @@ public: virtual void setProgressValue(int completed, int total); virtual void setProgressState(TaskbarProgressState state); virtual void setCount(int count); + virtual void addRecent(const Common::String &name, const Common::String &description); virtual void notifyError(); virtual void clearError(); diff --git a/backends/taskbar/macosx/macosx-taskbar.mm b/backends/taskbar/macosx/macosx-taskbar.mm index ae087dfb85..577320b79d 100644 --- a/backends/taskbar/macosx/macosx-taskbar.mm +++ b/backends/taskbar/macosx/macosx-taskbar.mm @@ -29,9 +29,6 @@ // NSDockTile was introduced with Mac OS X 10.5. // Try provide backward compatibility by avoiding NSDockTile symbols. -// TODO: Implement recent list, maybe as a custom menu on dock tile when app is not running -// See Dock Tile plug-in at https://developer.apple.com/library/mac/documentation/Carbon/Conceptual/customizing_docktile/CreatingaDockTilePlug-in/CreatingaDockTilePlug-in.html - #include "backends/taskbar/macosx/macosx-taskbar.h" #include "common/config-manager.h" #include "common/file.h" @@ -39,6 +36,9 @@ #include <AppKit/NSApplication.h> #include <AppKit/NSImage.h> #include <Foundation/NSString.h> +#include <Foundation/NSDictionary.h> +#include <Foundation/NSArray.h> +#include <Foundation/NSUserDefaults.h> #include <AppKit/NSImageView.h> #include <AppKit/NSColor.h> #include <AppKit/NSBezierPath.h> @@ -120,7 +120,7 @@ void MacOSXTaskbarManager::setOverlayIcon(const Common::String &name, const Comm initOverlayIconView(); CFStringRef imageFile = CFStringCreateWithCString(0, path.c_str(), kCFStringEncodingASCII); - NSImage* image = [[NSImage alloc] initWithContentsOfFile:(NSString *)imageFile]; + NSImage *image = [[NSImage alloc] initWithContentsOfFile:(NSString *)imageFile]; [_overlayIconView setImage:image]; [image release]; CFRelease(imageFile); @@ -234,5 +234,64 @@ return (path); \ return ""; } +void MacOSXTaskbarManager::addRecent(const Common::String &name, const Common::String &description) { + //warning("[MacOSXTaskbarManager::addRecent] Adding recent list entry: %s (%s)", name.c_str(), description.c_str()); + + if (_dockTile == nil) + return; + + // Store the game, description and icon in user preferences. + // The NSDockTilePlugin will retrieve them there to list them in the dock tile menu. + + CFStringRef gameName = CFStringCreateWithCString(0, name.c_str(), kCFStringEncodingASCII); + CFStringRef desc = CFStringCreateWithCString(0, description.c_str(), kCFStringEncodingASCII); + + // First build the dictionary for this game. + NSMutableDictionary *dict = [[NSMutableDictionary alloc] init]; + [dict setObject:(NSString *)gameName forKey:@"game"]; + [dict setObject:(NSString *)desc forKey:@"description"]; + + // Icon + Common::String iconPath = getIconPath(name); + if (!iconPath.empty()) { + CFStringRef icon = CFStringCreateWithCString(0, iconPath.c_str(), kCFStringEncodingASCII); + [dict setObject:(NSString *)icon forKey:@"icon"]; + CFRelease(icon); + } + + // Retrieve the current list of recent items and update it. + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + NSArray *oldArray = [defaults arrayForKey:@"recentGames"]; + if (oldArray == nil) { + [defaults setObject:[NSArray arrayWithObject:dict] forKey:@"recentGames"]; + } else { + NSMutableArray *newArray = [[NSMutableArray alloc] initWithArray:oldArray]; + // Insert the new game at the start + [newArray insertObject:dict atIndex:0]; + // If the game was already present in the array, remove it + for (int i = 1 ; i < [newArray count] ; ++i) { + NSDictionary *oldDict = [newArray objectAtIndex:i]; + if (oldDict == nil) + continue; + NSString *oldGame = [oldDict valueForKey:@"game"]; + if (oldGame != nil && [oldGame isEqualToString:(NSString*)gameName]) { + [newArray removeObjectAtIndex:i]; + break; + } + } + // And make sure we limit the size of the array to 5 games + if ([newArray count] > 5) + [newArray removeLastObject]; + [defaults setObject:newArray forKey:@"recentGames"]; + [newArray release]; + } + + // Finally release the dictionary + [dict release]; + CFRelease(gameName); + CFRelease(desc); +} + + #endif diff --git a/backends/updates/macosx/macosx-updates.h b/backends/updates/macosx/macosx-updates.h index fd2d1f46f5..9f541ad02a 100644 --- a/backends/updates/macosx/macosx-updates.h +++ b/backends/updates/macosx/macosx-updates.h @@ -39,8 +39,8 @@ public: virtual void setAutomaticallyChecksForUpdates(UpdateState state); virtual UpdateState getAutomaticallyChecksForUpdates(); - virtual void setUpdateCheckInterval(UpdateInterval interval); - virtual UpdateInterval getUpdateCheckInterval(); + virtual void setUpdateCheckInterval(int interval); + virtual int getUpdateCheckInterval(); }; #endif diff --git a/backends/updates/macosx/macosx-updates.mm b/backends/updates/macosx/macosx-updates.mm index a94f1c21fd..fc967f8fec 100644 --- a/backends/updates/macosx/macosx-updates.mm +++ b/backends/updates/macosx/macosx-updates.mm @@ -27,6 +27,7 @@ #ifdef USE_SPARKLE #include "common/translation.h" +#include "common/config-manager.h" #include <Cocoa/Cocoa.h> #include <Sparkle/Sparkle.h> @@ -74,11 +75,13 @@ MacOSXUpdateManager::MacOSXUpdateManager() { // Finally give up our references to the objects [menuItem release]; - // Enable automatic update checking once a day (alternatively use - // checkForUpdates() here to check for updates on every startup) - // TODO: Should be removed when an update settings gui is implemented - setAutomaticallyChecksForUpdates(kUpdateStateEnabled); - setUpdateCheckInterval(kUpdateIntervalOneDay); + if (!ConfMan.hasKey("updates_check") + || ConfMan.getInt("updates_check") == Common::UpdateManager::kUpdateIntervalNotSupported) { + setAutomaticallyChecksForUpdates(kUpdateStateDisabled); + } else { + setAutomaticallyChecksForUpdates(kUpdateStateEnabled); + setUpdateCheckInterval(normalizeInterval(ConfMan.getInt("updates_check"))); + } } MacOSXUpdateManager::~MacOSXUpdateManager() { @@ -103,14 +106,16 @@ Common::UpdateManager::UpdateState MacOSXUpdateManager::getAutomaticallyChecksFo return kUpdateStateDisabled; } -void MacOSXUpdateManager::setUpdateCheckInterval(UpdateInterval interval) { +void MacOSXUpdateManager::setUpdateCheckInterval(int interval) { if (interval == kUpdateIntervalNotSupported) return; + interval = normalizeInterval(interval); + [sparkleUpdater setUpdateCheckInterval:(NSTimeInterval)interval]; } -Common::UpdateManager::UpdateInterval MacOSXUpdateManager::getUpdateCheckInterval() { +int MacOSXUpdateManager::getUpdateCheckInterval() { // This is kind of a hack but necessary, as the value stored by Sparkle // might have been changed outside of ScummVM (in which case we return the // default interval of one day) diff --git a/base/main.cpp b/base/main.cpp index ff441df49c..587e32804f 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -75,6 +75,9 @@ #include "gui/launcher.h" #endif +#ifdef USE_UPDATES +#include "gui/updates-dialog.h" +#endif static bool launcherDialog() { @@ -458,6 +461,13 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) { // Now as the event manager is created, setup the keymapper setupKeymapper(system); +#ifdef USE_UPDATES + if (!ConfMan.hasKey("updates_check")) { + GUI::UpdatesDialog dlg; + dlg.runModal(); + } +#endif + // Unless a game was specified, show the launcher dialog if (0 == ConfMan.getActiveDomain()) launcherDialog(); diff --git a/common/memstream.h b/common/memstream.h index 5ecc553454..a01973c6fa 100644 --- a/common/memstream.h +++ b/common/memstream.h @@ -25,6 +25,7 @@ #include "common/stream.h" #include "common/types.h" +#include "common/util.h" namespace Common { @@ -170,7 +171,7 @@ private: byte *old_data = _data; - _capacity = new_len + 32; + _capacity = MAX(new_len + 32, _capacity * 2); _data = (byte *)malloc(_capacity); _ptr = _data + _pos; diff --git a/common/module.mk b/common/module.mk index 67c498df00..570040c8e1 100644 --- a/common/module.mk +++ b/common/module.mk @@ -56,5 +56,10 @@ MODULE_OBJS += \ recorderfile.o endif +ifdef USE_UPDATES +MODULE_OBJS += \ + updates.o +endif + # Include common rules include $(srcdir)/rules.mk diff --git a/common/platform.cpp b/common/platform.cpp index 636c1ddb52..280185d862 100644 --- a/common/platform.cpp +++ b/common/platform.cpp @@ -27,6 +27,7 @@ namespace Common { const PlatformDescription g_platforms[] = { { "2gs", "2gs", "2gs", "Apple IIgs", kPlatformApple2GS }, + { "apple2", "apple2", "apple2", "Apple II", kPlatformApple2 }, { "3do", "3do", "3do", "3DO", kPlatform3DO }, { "acorn", "acorn", "acorn", "Acorn", kPlatformAcorn }, { "amiga", "ami", "amiga", "Amiga", kPlatformAmiga }, diff --git a/common/platform.h b/common/platform.h index 17a332b851..15bcddb62e 100644 --- a/common/platform.h +++ b/common/platform.h @@ -50,6 +50,7 @@ enum Platform { kPlatformSegaCD, kPlatform3DO, kPlatformPCEngine, + kPlatformApple2, kPlatformApple2GS, kPlatformPC98, kPlatformWii, diff --git a/common/updates.cpp b/common/updates.cpp new file mode 100644 index 0000000000..4174a96c56 --- /dev/null +++ b/common/updates.cpp @@ -0,0 +1,68 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "common/system.h" +#include "common/updates.h" +#include "common/translation.h" + +namespace Common { + +static const int updateIntervals[] = { + UpdateManager::kUpdateIntervalNotSupported, + UpdateManager::kUpdateIntervalOneDay, + UpdateManager::kUpdateIntervalOneWeek, + UpdateManager::kUpdateIntervalOneMonth, + -1 +}; + +const int *UpdateManager::getUpdateIntervals() { + return updateIntervals; +} + +int UpdateManager::normalizeInterval(int interval) { + const int *val = updateIntervals; + + while (*val != -1) { + if (*val > interval) + return *val; + val++; + } + + return val[-1]; // Return maximal acceptable value +} + +const char *UpdateManager::updateIntervalToString(int interval) { + switch (interval) { + case kUpdateIntervalNotSupported: + return _("Never"); + case kUpdateIntervalOneDay: + return _("Daily"); + case kUpdateIntervalOneWeek: + return _("Weekly"); + case kUpdateIntervalOneMonth: + return _("Monthly"); + default: + return _("<Bad value>"); + } +} + +} // End of namespace Common diff --git a/common/updates.h b/common/updates.h index 4c30987c38..65eb5ac095 100644 --- a/common/updates.h +++ b/common/updates.h @@ -20,8 +20,8 @@ * */ -#ifndef BACKENDS_UPDATES_ABSTRACT_H -#define BACKENDS_UPDATES_ABSTRACT_H +#ifndef COMMON_UPDATES_H +#define COMMON_UPDATES_H #if defined(USE_UPDATES) @@ -85,18 +85,42 @@ public: * * @param interval The interval. */ - virtual void setUpdateCheckInterval(UpdateInterval interval) {} + virtual void setUpdateCheckInterval(int interval) {} /** * Gets the update check interval. * * @return the update check interval. */ - virtual UpdateInterval getUpdateCheckInterval() { return kUpdateIntervalNotSupported; } + virtual int getUpdateCheckInterval() { return kUpdateIntervalNotSupported; } + + /** + * Returns list of supported uptate intervals. + * Ending with '-1' which is not acceptable value. + * + * @return list of integer values representing update intervals in seconds. + */ + static const int *getUpdateIntervals(); + + /** + * Returns string representation of a given interval. + * + * @param interval The interval. + * @return pointer to localized string of given interval. + */ + static const char *updateIntervalToString(int interval); + + /** + * Rounds up the given interval to acceptable value. + * + * @param interval The interval. + * @return rounded up interval + */ + static int normalizeInterval(int interval); }; } // End of namespace Common #endif -#endif // BACKENDS_UPDATES_ABSTRACT_H +#endif // COMMON_UPDATES_H @@ -128,6 +128,7 @@ _timidity=auto _zlib=auto _mpeg2=auto _sparkle=auto +_osxdockplugin=auto _jpeg=auto _png=auto _theoradec=auto @@ -182,6 +183,7 @@ _win32path="c:/scummvm" _amigaospath="Games:ScummVM" _staticlibpath= _xcodetoolspath= +_sparklepath= _sdlconfig=sdl-config _freetypeconfig=freetype-config _sdlpath="$PATH" @@ -991,6 +993,8 @@ Optional Libraries: --with-sparkle-prefix=DIR Prefix where sparkle is installed (Mac OS X only - optional) --disable-sparkle disable sparkle automatic update support [Mac OS X only - autodetect] + --disable-osx-dock-plugin disable the NSDockTilePlugin support [Mac OS X only - autodetect] + --with-sdl-prefix=DIR Prefix where the sdl-config script is installed (optional) @@ -1053,6 +1057,8 @@ for ac_option in $@; do --disable-zlib) _zlib=no ;; --enable-sparkle) _sparkle=yes ;; --disable-sparkle) _sparkle=no ;; + --enable-osx-dock-plugin) _osxdockplugin=yes;; + --disable-osx-dock-plugin) _osxdockplugin=no;; --enable-nasm) _nasm=yes ;; --disable-nasm) _nasm=no ;; --enable-mpeg2) _mpeg2=yes ;; @@ -1168,8 +1174,7 @@ for ac_option in $@; do ;; --with-sparkle-prefix=*) arg=`echo $ac_option | cut -d '=' -f 2` - SPARKLE_CFLAGS="-F$arg" - SPARKLE_LIBS="-F$arg" + _sparklepath=$arg ;; --with-readline-prefix=*) arg=`echo $ac_option | cut -d '=' -f 2` @@ -3932,26 +3937,65 @@ echo "$_mpeg2" # # Check for Sparkle if updates support is enabled # -echocheck "Sparkle" -if test "$_updates" = no; then - _sparkle=no -else -if test "$_sparkle" = auto ; then - _sparkle=no - cat > $TMPC << EOF +# +# Check is NSDockTilePlugIn protocol is supported +# +case $_host_os in + darwin*) + echocheck "Sparkle" + if test "$_updates" = no; then + _sparkle=no + else + if test ! -z $_sparklepath ; then + SPARKLE_CFLAGS="-F$_sparklepath" + SPARKLE_LIBS="-F$_sparklepath" + fi + if test "$_sparkle" = auto ; then + _sparkle=no + cat > $TMPC << EOF #include <Cocoa/Cocoa.h> #include <Sparkle/Sparkle.h> int main(void) { SUUpdater *updater = [SUUpdater sharedUpdater]; return 0; } EOF - cc_check $SPARKLE_CFLAGS $SPARKLE_LIBS -framework Sparkle -ObjC++ -lobjc && _sparkle=yes -fi -if test "$_sparkle" = yes ; then - append_var LIBS "$SPARKLE_LIBS -framework Sparkle" - append_var INCLUDES "$SPARKLE_CFLAGS" -fi -define_in_config_if_yes "$_sparkle" 'USE_SPARKLE' -fi -echo "$_sparkle" + cc_check $SPARKLE_CFLAGS $SPARKLE_LIBS -framework Sparkle -ObjC++ -lobjc && _sparkle=yes + fi + if test "$_sparkle" = yes ; then + append_var LIBS "$SPARKLE_LIBS -framework Sparkle" + append_var INCLUDES "$SPARKLE_CFLAGS" + fi + define_in_config_if_yes "$_sparkle" 'USE_SPARKLE' + fi + echo "$_sparkle" + ;; + *) + _sparkle=no + ;; +esac + +# +# Check is NSDockTilePlugIn protocol is supported +# +case $_host_os in + darwin*) + # NSDockTilePlugIn was added in OS X 10.6, so will not be available when compiling on older OS X versions. + echocheck "DockTilePlugin" + if test "$_osxdockplugin" = auto ; then + _osxdockplugin=no + cat > $TMPC << EOF +#include <Cocoa/Cocoa.h> +@interface ScummVMDockTilePlugIn : NSObject <NSDockTilePlugIn> { +} +@end +EOF + cc_check -c -ObjC++ && _osxdockplugin=yes + fi + define_in_config_if_yes "$_osxdockplugin" 'USE_DOCKTILEPLUGIN' + echo "$_osxdockplugin" + ;; + *) + _osxdockplugin=no + ;; +esac # # Check for FluidSynth @@ -4751,6 +4795,7 @@ WIN32PATH=$_win32path AMIGAOSPATH=$_amigaospath STATICLIBPATH=$_staticlibpath XCODETOOLSPATH=$_xcodetoolspath +SPARKLEPATH=$_sparklepath SDLCONFIG=$_sdlconfig ABI := $ABI diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index adfe75c624..0242af1cfb 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -125,7 +125,6 @@ int main(int argc, char *argv[]) { ProjectType projectType = kProjectNone; int msvcVersion = 12; - bool useSDL2 = false; // Parse command line arguments using std::cout; @@ -269,7 +268,7 @@ int main(int argc, char *argv[]) { } else if (!std::strcmp(argv[i], "--tests")) { setup.tests = true; } else if (!std::strcmp(argv[i], "--sdl2")) { - useSDL2 = true; + setup.useSDL2 = true; } else { std::cerr << "ERROR: Unknown parameter \"" << argv[i] << "\"\n"; return -1; @@ -349,11 +348,15 @@ int main(int argc, char *argv[]) { setup.defines.push_back("IPHONE"); } setup.defines.push_back("SDL_BACKEND"); - if (!useSDL2) { - cout << "\nLinking to SDL 1.2\n\n"; + if (!setup.useSDL2) { + cout << "\nBuilding against SDL 1.2\n\n"; setup.libraries.push_back("sdl"); } else { - cout << "\nLinking to SDL 2.0\n\n"; + cout << "\nBuilding against SDL 2.0\n\n"; + // TODO: This also defines USE_SDL2 in the preprocessor, we don't do + // this in our configure/make based build system. Adapt create_project + // to replicate this behavior. + setup.defines.push_back("USE_SDL2"); setup.libraries.push_back("sdl2"); } setup.libraries.push_back("winmm"); diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h index fb207f3f59..1e417d485b 100644 --- a/devtools/create_project/create_project.h +++ b/devtools/create_project/create_project.h @@ -229,15 +229,17 @@ struct BuildSetup { StringList testDirs; ///< List of all folders containing tests bool devTools; ///< Generate project files for the tools - bool tests; ///< Generate project files for the tests + bool tests; ///< Generate project files for the tests bool runBuildEvents; ///< Run build events as part of the build (generate revision number and copy engine/theme data & needed files to the build folder bool createInstaller; ///< Create NSIS installer after the build + bool useSDL2; ///< Whether to use SDL2 or not. BuildSetup() { devTools = false; tests = false; runBuildEvents = false; createInstaller = false; + useSDL2 = false; } }; diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp index a804205c42..2c6a89543f 100644 --- a/devtools/create_project/msbuild.cpp +++ b/devtools/create_project/msbuild.cpp @@ -366,7 +366,7 @@ void MSBuildProvider::outputGlobalPropFile(const BuildSetup &setup, std::ofstrea "\t\t<_PropertySheetDisplayName>" << setup.projectDescription << "_Global</_PropertySheetDisplayName>\n" "\t\t<ExecutablePath>$(" << LIBS_DEFINE << ")\\bin;$(" << LIBS_DEFINE << ")\\bin\\" << (bits == 32 ? "x86" : "x64") << ";$(ExecutablePath)</ExecutablePath>\n" "\t\t<LibraryPath>$(" << LIBS_DEFINE << ")\\lib\\" << (bits == 32 ? "x86" : "x64") << ";$(" << LIBS_DEFINE << ")\\lib\\" << (bits == 32 ? "x86" : "x64") << "\\$(Configuration);$(LibraryPath)</LibraryPath>\n" - "\t\t<IncludePath>$(" << LIBS_DEFINE << ")\\include;$(" << LIBS_DEFINE << ")\\include\\SDL;$(IncludePath)</IncludePath>\n" + "\t\t<IncludePath>$(" << LIBS_DEFINE << ")\\include;$(" << LIBS_DEFINE << ")\\include\\" << (setup.useSDL2 ? "SDL2" : "SDL") << ";$(IncludePath)</IncludePath>\n" "\t\t<OutDir>$(Configuration)" << bits << "\\</OutDir>\n" "\t\t<IntDir>$(Configuration)" << bits << "\\$(ProjectName)\\</IntDir>\n" "\t</PropertyGroup>\n" diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp index ac7a1d0617..bfe7f522f0 100644 --- a/devtools/create_project/xcode.cpp +++ b/devtools/create_project/xcode.cpp @@ -927,7 +927,11 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) { ADD_SETTING_LIST(scummvmOSX_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvmOSX_defines, kSettingsNoQuote | kSettingsAsList, 5); ADD_SETTING_QUOTE(scummvmOSX_Debug, "GCC_VERSION", ""); ValueList scummvmOSX_HeaderPaths; - scummvmOSX_HeaderPaths.push_back("/opt/local/include/SDL"); + if (setup.useSDL2) { + scummvmOSX_HeaderPaths.push_back("/opt/local/include/SDL2"); + } else { + scummvmOSX_HeaderPaths.push_back("/opt/local/include/SDL"); + } scummvmOSX_HeaderPaths.push_back("/opt/local/include"); scummvmOSX_HeaderPaths.push_back("/opt/local/include/freetype2"); scummvmOSX_HeaderPaths.push_back("include/"); @@ -943,7 +947,6 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) { ADD_SETTING_LIST(scummvmOSX_Debug, "LIBRARY_SEARCH_PATHS", scummvmOSX_LibPaths, kSettingsNoQuote | kSettingsAsList, 5); ADD_SETTING_QUOTE(scummvmOSX_Debug, "OTHER_CFLAGS", ""); ValueList scummvmOSX_LdFlags; - scummvmOSX_LdFlags.push_back("-lSDLmain"); scummvmOSX_LdFlags.push_back("-logg"); scummvmOSX_LdFlags.push_back("-lpng"); scummvmOSX_LdFlags.push_back("-ljpeg"); @@ -953,7 +956,13 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) { scummvmOSX_LdFlags.push_back("-lvorbis"); scummvmOSX_LdFlags.push_back("-lmad"); scummvmOSX_LdFlags.push_back("-lFLAC"); - scummvmOSX_LdFlags.push_back("-lSDL"); + if (setup.useSDL2) { + scummvmOSX_LdFlags.push_back("-lSDL2main"); + scummvmOSX_LdFlags.push_back("-lSDL2"); + } else { + scummvmOSX_LdFlags.push_back("-lSDLmain"); + scummvmOSX_LdFlags.push_back("-lSDL"); + } scummvmOSX_LdFlags.push_back("-lz"); ADD_SETTING_LIST(scummvmOSX_Debug, "OTHER_LDFLAGS", scummvmOSX_LdFlags, kSettingsAsList, 5); ADD_SETTING(scummvmOSX_Debug, "PREBINDING", "NO"); diff --git a/devtools/credits.pl b/devtools/credits.pl index c67793cbfa..e306820f32 100755 --- a/devtools/credits.pl +++ b/devtools/credits.pl @@ -1007,6 +1007,7 @@ begin_credits("Credits"); begin_section("Mac OS X"); add_person("Max Horn", "Fingolfin", "(retired)"); add_person("Oystein Eftevaag", "vinterstum", ""); + add_person("Thierry Crozat", "criezy", ""); end_section(); begin_section("Mandriva"); diff --git a/devtools/encode-macbinary.sh b/devtools/encode-macbinary.sh new file mode 100755 index 0000000000..6635f7fcda --- /dev/null +++ b/devtools/encode-macbinary.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# +# Iterates over current directory, encodes all files with +# MacBinary but ensures that the dates are preserved + +for i in * +do + macbinary encode "$i" + touch -r "$i" "$i.bin" + mv "$i.bin" "$i" +done diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt index e9140f74f9..235986a878 100644 --- a/devtools/scumm-md5.txt +++ b/devtools/scumm-md5.txt @@ -50,25 +50,26 @@ # IFS=$OIFS # maniac Maniac Mansion - 2d624d1b214f7faf0094daea65c6d1a6 -1 en 2gs Apple II - - + 2d624d1b214f7faf0094daea65c6d1a6 -1 en 2gs Apple II - - 2cb46375dd5cdfd023e2f07e0a21b530 -1 en C64 C64 Demo - Robert Crossfield - eea4d9ac2fb6f145945a308e8866915b -1 en C64 C64 - - - 439a7f4adf510489981ac52308e7d7a2 -1 de C64 C64 - - + eea4d9ac2fb6f145945a308e8866915b -1 en C64 C64 - - + 439a7f4adf510489981ac52308e7d7a2 -1 de C64 C64 - - 7f45ddd6dbfbf8f80c0c0efea4c295bc 1972 en DOS V1 V1 - Fingolfin - 17f7296f63c78642724f057fd8e736a7 2082 gb NES NES - - 91d5db93187fab54d823f73bd6441cb6 -1 us NES NES - - 1c7e7db2cfab1ad62746ab680a634204 -1 fr NES NES - - 3a5ec90d556d4920976c5578bfbfaf79 -1 de NES NES - - b7d37d6b786b5a22deea3b038eca96ca -1 es NES NES - - fa3cb1541f9d7cf99ccbae6249bc150c -1 it NES NES - - 6b5a3fef241e90d4b2e77f1e222773ee -1 se NES NES - + 17f7296f63c78642724f057fd8e736a7 2082 gb NES NES - + 91d5db93187fab54d823f73bd6441cb6 -1 us NES NES - + 1c7e7db2cfab1ad62746ab680a634204 -1 fr NES NES - + 3a5ec90d556d4920976c5578bfbfaf79 -1 de NES NES - + b7d37d6b786b5a22deea3b038eca96ca -1 es NES NES - + fa3cb1541f9d7cf99ccbae6249bc150c -1 it NES NES - + 6b5a3fef241e90d4b2e77f1e222773ee -1 se NES NES - e781230da44a44e2f0770edb2b3b3633 -1 en Amiga V2 V2 - dhewg, Andrea Petrucci ce7733f185b838e248927c7ba1a04204 -1 fr Amiga V2 V2 - Tobias Fleischer 9bc548e179cdb0767009401c094d0895 -1 de Amiga V2 V2 - Norbert Lange + 3cf4b6ff78f735b671d8ccc2bc110b15 -1 es Amiga V2 V2 - vanfanel a570381b028972d891052ee1e51dc011 1988 en Atari V2 V2 SS Andreas Bylund 0c331637580950aea2346e012ef2a868 1988 en Atari V2 V2 DS Petr Maruska dd30a53035393baa5a5e222e716559af -1 fr Atari V2 V2 - Andreas Bylund @@ -87,9 +88,9 @@ maniac Maniac Mansion 3a988de37118873ad129246b452909c0 1988 ru DOS V2 Demo V2 Demo non-interactive sev zak Zak McKracken and the Alien Mindbenders - 254fede2f15dbb32a23760d601b01816 -1 en C64 V1 - - - 95be99181bd0f10fef4872c2d4a771cb -1 de C64 V1 - - - aeec382acef62e122bf0d5b14581cfa4 -1 it C64 V1 - - + 254fede2f15dbb32a23760d601b01816 -1 en C64 V1 - - + 95be99181bd0f10fef4872c2d4a771cb -1 de C64 V1 - - + aeec382acef62e122bf0d5b14581cfa4 -1 it C64 V1 - - 7020931d5a2be0a49d68e7a1882363e4 1896 en DOS V1 V1 - Fingolfin b23f7cd7c304d7dff08e92a96120d5b4 -1 en DOS V1 V1 alt? Andrea Petrucci @@ -97,9 +98,9 @@ zak Zak McKracken and the Alien Mindbenders 91469353f7be1b122fa88d23480a1320 -1 fr Amiga V2 V2 - Tobias Fleischer 6027e9ca9c35746d95dee2068cec17e5 -1 de Amiga V2 V2 - Norbert Lange 27b3a4224ad63d5b04627595c1c1a025 -1 it Amiga V2 V2 - Andrea Petrucci - d55eff37c2100f5065cde9de428621fa -1 en Atari V2 V2 - + d55eff37c2100f5065cde9de428621fa -1 en Atari V2 V2 - 613f64f78ea26c7353b2a5940eb61d6a -1 fr Atari V2 V2 - Andreas Bylund - ff05c07990061d97647f059c48c1d05a -1 de Atari V2 V2 - + ff05c07990061d97647f059c48c1d05a -1 de Atari V2 V2 - 675d71151e9b5a968c8ce46d9fbf4cbf 1916 en DOS V2 V2 - Kirben debe337f73d660e951ece7c1f1c81add -1 en DOS V2 V2 alt? Andrea Petrucci 52a4bae0746a11d7b1e8554e91a6645c -1 fr DOS V2 V2 - Andrea Petrucci @@ -110,7 +111,7 @@ zak Zak McKracken and the Alien Mindbenders 75ba23fff4fd63fa446c02864f2a5a4b -1 it DOS V2 V2 alt? Antti Leimi, Andrea Petrucci a77d0efbe786ea7f490c2021dbfa3f2f -1 ru DOS V2 V2 - sev - 2d4536a56e01da4b02eb021e7770afa2 7520 en FM-TOWNS FM-TOWNS - - + 2d4536a56e01da4b02eb021e7770afa2 7520 en FM-TOWNS FM-TOWNS - - 1ca86e2cf9aaa2068738a1e5ba477e60 -1 jp FM-TOWNS FM-TOWNS - - Andrea Petrucci 8299d9b8a1b0e7b881bae7a9971dc5e2 1916 en Atari V2 Demo non-interactive Fingolfin @@ -120,7 +121,7 @@ indy3 Indiana Jones and the Last Crusade e689bdf67f98b1d760ce4487ec0e8d06 -1 fr Amiga EGA EGA - Gerald Vincent 330f631502e381a4e199a3f7cb483c20 -1 de Amiga EGA EGA - dhewg df03ee021aa9b81d90cab9c26da07614 -1 it Amiga EGA EGA - Andrea Petrucci - 62b8c16b6db226ba95aaa8be73f9885c -1 es Amiga EGA EGA - + 62b8c16b6db226ba95aaa8be73f9885c -1 es Amiga EGA EGA - 157367c3c21e0d03a0cba44361b4cf65 -1 en Atari No AdLib EGA - Andreas Bylund 0f9c7a76657f0840b8f7ccb5bffeb9f4 -1 fr Atari No AdLib EGA - Andreas Bylund aaa7f36a253f277dd29dd1c051b0e4b9 -1 de Atari No AdLib EGA - Jimmy Kohl @@ -130,7 +131,7 @@ indy3 Indiana Jones and the Last Crusade 66236cd1aec24e1d4aff4c4cc93b7e18 -1 fr DOS EGA EGA ?? v1.3, 25 Aug 89 Andrea Petrucci, Peter Eckerlein 89cfc425566003ff74b7dc7b3e6fd469 -1 fr DOS EGA EGA ?? v1.3, 25 Aug 89 Jorpho 69d70269fafc4445adbb0d223e4f9a3f 5361 en DOS EGA EGA v1.4, 11/07/89 (5.25\") Petr Maruska - 56e8c37a0a08c3a7076f82417461a877 -1 en DOS EGA EGA v1.4, 7 Nov 89 (3.5\") Paulo Vicente + 56e8c37a0a08c3a7076f82417461a877 -1 en DOS EGA EGA v1.4, 7 Nov 89 (3.5\") Paulo Vicente 6f6ef668c608c7f534fea6e6d3878dde -1 de DOS EGA EGA v1.4 from 19 Oct 89 dhewg, Peter Eckerlein eb700bb73ca1cc44a1ad5e4b1a4bdeaf 5361 de DOS EGA EGA PC-Spiele a.borque d62d248c3df6ec177405e2cb23d923b2 -1 it DOS EGA EGA v1.4 from 25 Nov 89 Andrea Petrucci, Peter Eckerlein @@ -143,7 +144,7 @@ indy3 Indiana Jones and the Last Crusade a15d6e1e2c52bbd0ff7fa6b63ab7f796 680340 en Mac Steam Steam Steam Version Filippos Karapetis 399b217b0c8d65d0398076da486363a9 6295 de DOS VGA VGA VGA v1.02 from 7 Nov 91 Peter Eckerlein, Fingolfin 17b5d5e6af4ae89d62631641d66d5a05 -1 it DOS VGA VGA IBM 256 color v2.1 from 3 May 01 Andrea Petrucci, Peter Eckerlein - 3cce1913a3bc586b51a75c3892ff18dd -1 ru DOS VGA VGA VGA + 3cce1913a3bc586b51a75c3892ff18dd -1 ru DOS VGA VGA VGA 04687cdf7f975a89d2474929f7b80946 7552 en FM-TOWNS FM-TOWNS - v1.00 1/23/91 Fingolfin 3a0c35f3c147b98a2bdf8d400cfc4ab5 -1 jp FM-TOWNS FM-TOWNS - - Paul Priest, Andrea Petrucci @@ -155,8 +156,8 @@ loom Loom 39cb9dec16fa16f38d79acd80effb059 -1 All Amiga EGA EGA IT and FR Gerald Vincent (IT), Andrea Petrucci (FR) 2fe369ad70f52a8cf7ad6077ee64f81a -1 de Amiga EGA EGA - Norbert Lange 48b9f04b348bc5013327753f0d12a144 -1 es Amiga EGA EGA - VooD - a0a7dea72003933b8b3f8b99b9f7ddeb -1 en Atari No AdLib EGA - - 0e9b01430e31d9fcd94071d433bbc6bf -1 fr Atari No AdLib EGA - + a0a7dea72003933b8b3f8b99b9f7ddeb -1 en Atari No AdLib EGA - + 0e9b01430e31d9fcd94071d433bbc6bf -1 fr Atari No AdLib EGA - c24c490373aeb48fbd54caa8e7ae376d -1 de Atari No AdLib EGA - Andreas Bylund 28ef68ee3ed76d7e2ee8ee13c15fbd5b 5748 en DOS EGA EGA v1.0 from 8 Mar 90 Peter Eckerlein, Fingolfin 73e5ab7dbb9a8061cc6d25df02dbd1e7 -1 en DOS EGA EGA v1.0 alt Andrea Petrucci @@ -167,7 +168,7 @@ loom Loom 6f8a22bfa397be1f7ed4b74aba0e397e -1 fr DOS EGA EGA v1.2 26 Jun 90 Jorpho 470c45b636139bb40716daa1c7edaad0 -1 de DOS EGA EGA v1.2 Deutsch from 7 Jun 90 Peter Eckerlein fa127d7c4bb47d05bb1c33ddcaa9f767 5748 de DOS EGA EGA v1.2 Deutsch from 7 Jun 90 Fingolfin - 187d315f6b5168f68680dfe8c3d76a3e -1 he DOS EGA EGA - + 187d315f6b5168f68680dfe8c3d76a3e -1 he DOS EGA EGA - c3df37df9d3b481b45f75283a9907c47 -1 it DOS EGA EGA - Andrea Petrucci 0be88565f734b1e9e77ccaaf3bb14b29 -1 es DOS EGA EGA v1.2 Espanol from 31 Aug 90 George Kormend 2a208ffbcd0e83e86f4356e6f64aa6e1 -1 es DOS EGA EGA v1.2 Espanol from 31 Aug 90 abnog, Andrea Petrucci, Peter Eckerlein @@ -187,10 +188,10 @@ loom Loom a00554c31d623fdb9fcb0f924b89b42b -1 en DOS EGA EGA Demo non-interactive Adrian C. Fruehwirth monkey The Secret of Monkey Island - c666a998af90d81db447eccba9f72c8d -1 en Atari No AdLib EGA - + c666a998af90d81db447eccba9f72c8d -1 en Atari No AdLib EGA - 9e5e0fb43bd22f4628719b7501adb717 -1 fr Atari No AdLib EGA - Andreas Bylund 927a764615c7fcdd72f591355e089d8c -1 de Atari No AdLib EGA - Joachim Eberhard - 0a41311d462b6639fc45297b9044bf16 -1 es Atari No AdLib EGA - + 0a41311d462b6639fc45297b9044bf16 -1 es Atari No AdLib EGA - 49210e124e4c2b30f1290a9ef6306301 8357 en DOS EGA EGA 8 disk v1.0, 9/18/90 Fingolfin 1dd3c11ea4439adfe681e4e405b624e1 -1 fr DOS EGA EGA 8 disk Andrea Petrucci @@ -210,7 +211,7 @@ monkey The Secret of Monkey Island 870d1e3c86bc50846d808d14a36b4e08 -1 es Amiga VGA VGA - Andreas Bylund c7890e038806df2bb5c0c8c6f1986ea2 -1 en DOS VGA VGA 8 disk Andrea Petrucci - 15e03ffbfeddb9c2aebc13dcb2a4a8f4 8357 en DOS VGA VGA 4 disk + 15e03ffbfeddb9c2aebc13dcb2a4a8f4 8357 en DOS VGA VGA 4 disk 08656dd9698ddf1023ba9bf8a195e37b -1 en DOS VGA VGA V1.1 crossbow777 d0b531227a27c6662018d2bd05aac52a 8357 de DOS VGA VGA 4 disk v1.1, 14.Feb.91 Fingolfin 66fd5ff9a810dfeb6d6bdada18221140 -1 it DOS VGA VGA 4 disk Andrea Petrucci @@ -225,9 +226,9 @@ monkey The Secret of Monkey Island da6269b18fcb08189c0aa9c95533cce2 8955 it DOS CD CD CD-ROM v2.3 Fingolfin, Andrej Sinicyn, Andrea Petrucci f049e38c1f8302b5db6170f1872af89a 8955 es DOS CD CD CD-ROM v2.3 Fingolfin, Andrej Sinicyn, Andrea Petrucci 2ccd8891ce4d3f1a334d21bff6a88ca2 9455 en Mac CD - Mac v2.4 Fingolfin, Lars Næsbye Christensen - b9ba19ce376efc69be78ef3baef8d2b9 -1 en Mac CD - alt? Grant Yeager + b9ba19ce376efc69be78ef3baef8d2b9 -1 en Mac CD - alt? Grant Yeager - c13225cb1bbd3bc9fe578301696d8021 -1 en SEGA SEGA - - + c13225cb1bbd3bc9fe578301696d8021 -1 en SEGA SEGA - - 057c9b456dedcc4d71b991a3072a20b3 9465 jp SEGA SEGA - - GloKidd 8eb84cee9b429314c7f0bdcf560723eb 9925 en FM-TOWNS FM-TOWNS - - Paul Priest, Andrea Petrucci @@ -255,7 +256,7 @@ monkey2 Monkey Island 2: LeChuck's Revenge da669b20271b85182e9c17a2a37ea02e -1 de Amiga - - - Andreas Bylund, Norbert Lange 11ddf1fde76e3156eb3a38da213f484e -1 it Amiga - - - Andrea Petrucci 6ea966b4d660c870b9ee790d1fbfc535 -1 es Amiga - - - Andreas Bylund - 3686cf8f89e102ececf4366e1d2c8126 11135 en DOS - - - + 3686cf8f89e102ececf4366e1d2c8126 11135 en DOS - - - 8e4ee4db46954bfe2912e259a16fad82 -1 fr DOS - - - Nicolas Sauzède, Andrea Petrucci 6886e5d08cee329b1f2e743ae2e3ceed 11135 de DOS - - v1.0D 17Feb92 Fingolfin 69ea626f1f87eecb78ea0d6c6b983a1d -1 it DOS - - - Andrea Petrucci @@ -295,14 +296,14 @@ atlantis Indiana Jones and the Fate of Atlantis c7be10f775404fd9785a8b92a06d240c 12030 en FM-TOWNS FM-TOWNS - - dhewg, Andrea Petrucci 4d34042713958b971cb139fba4658586 -1 jp FM-TOWNS FM-TOWNS - - Andrea Petrucci - 035deab53b47bc43abc763560d0f8d4b -1 en DOS Floppy Demo - + 035deab53b47bc43abc763560d0f8d4b -1 en DOS Floppy Demo - 98744fe66ff730e8c2b3b1f58803ab0b -1 en DOS Floppy Demo - Simon Krumrein, sev 12cdc256eae5a461bcc9a49975999841 -1 en DOS Floppy Demo - Paulo Vicente - 99b6f822b0b2612415407865438697d6 -1 en DOS - Demo non-interactive + 99b6f822b0b2612415407865438697d6 -1 en DOS - Demo non-interactive 28d24a33448fab6795850bc9f159a4a2 11170 jp FM-TOWNS FM-TOWNS Demo non-interactive khalek, Fingolfin tentacle Day of the Tentacle - acad97ab1c6fc2a5b2d98abf6db4a190 -1 en All? Floppy Floppy Version A ? + acad97ab1c6fc2a5b2d98abf6db4a190 -1 en All? Floppy Floppy Version A ? 2723fea3dae0cb47768c424b145ae0e7 7932 en DOS Floppy Floppy Version B ? Andrej Sinicyn, Andrea Petrucci, Fingolfin f0ccc12a8704bf57706b42a37f877128 -1 en DOS Floppy Floppy 1.6 Paulo Vicente 92b078d9d6d9d751da9c26b8b3075779 -1 fr DOS Floppy Floppy - Nicolas Sauzède, Andrea Petrucci @@ -338,11 +339,11 @@ samnmax Sam & Max Hit the Road 0fb73eddfcf584c02ba097984df131ba 9080 de All? - CD - Fingolfin 0f6f2e716ba896a44e5059bba1de7ca9 -1 it All? - CD - Andrea Petrucci 4ba7fb331296c283e73d8f5b2096e551 -1 es All? - CD - Andrea Petrucci - d43352a805d78b5f4936c6d7779bf575 -1 ru DOS - CD - + d43352a805d78b5f4936c6d7779bf575 -1 ru DOS - CD - 166553538ff320c69edafeee29525419 199195304 en Mac - CD Mac bundle Joachim Eberhard 3a5d13675e9a23aedac0bac7730f0ac1 228446581 fr Mac - CD Mac bundle ThierryFR, Thierry Crozat - c3196c5349e53e387aaff1533d95e53a -1 en DOS Floppy Demo - + c3196c5349e53e387aaff1533d95e53a -1 en DOS Floppy Demo - 0e4c5d54a0ad4b26132e78b5ea76642a 6485 en DOS Floppy Demo WIP Fingolfin d9d0dd93d16ab4dec55cabc2b86bbd17 6478 en DOS - Demo non-interactive Fingolfin cc8ba2b0df2f9c450bcf055fe2711979 7485 de DOS Floppy Demo - Simon Krumrein, sev, Fingolfin @@ -358,12 +359,12 @@ ft Full Throttle 55518cd73cf9c6d23ea29c51ee06bdfe -1 it All? - - - delfino 55e4cc866ff9046824e1c638ba2b8c7f -1 ru All? - Akella - sev 291fb06071e65897f755846611f5ad40 19697 ru All? - 7-Wolf - sev - e72bb4c2b613db2cf50f89ff6350e70a -1 es All? - - - + e72bb4c2b613db2cf50f89ff6350e70a -1 es All? - - - fe381e45117878b1e942cb876b050fd6 513243679 en Mac - - Mac bundle Fingolfin 04401d747f1a2c1c4b388daff71ed378 535405461 de Mac - - Mac bundle Fingolfin 403d2ec4d60d3cdae925e6cbf67716d6 489436643 fr Mac - - Mac bundle Thierry Crozat - 32a433dea56b86a55b59e4ff7d755711 -1 en DOS Demo Demo - + 32a433dea56b86a55b59e4ff7d755711 -1 en DOS Demo Demo - 9d7b67be003fea60be4dcbd193611936 11164 en Mac Demo Demo - Fingolfin 9b7452b5cd6d3ffb2b2f5118010af84f 116463537 en Mac Demo Demo Mac bundle Fingolfin, Joachim Eberhard @@ -381,7 +382,7 @@ dig The Dig comi The Curse of Monkey Island fe60d6b5ff51b0553ac59963123b5777 76791 All Windows - - - Fingolfin - 861e59ed72a1cd0e6d454f7ee7e2bf3d -1 ru Windows - - - + 861e59ed72a1cd0e6d454f7ee7e2bf3d -1 ru Windows - - - 8fec68383202d38c0d25e9e3b757c5df 18041 All Windows Demo Demo - Fingolfin @@ -764,7 +765,7 @@ puttmoon Putt-Putt Goes to the Moon 9c92eeaf517a31b7221ec2546ab669fd -1 en Windows HE 70 - - khalek 3c4c471342bd95505a42334367d8f127 12161 ru Windows HE 70 - - sev - aa6a91b7f6f119d1b7b1f2a4c9e24d59 6233 en DOS - Demo - + aa6a91b7f6f119d1b7b1f2a4c9e24d59 6233 en DOS - Demo - 4af4a6b248103c1fe9edef619677f540 -1 en Mac - Demo - khalek 9c143c5905055d5df7a0f014ab379aee -1 en Windows HE 70 Demo - khalek @@ -792,7 +793,7 @@ puttputt Putt-Putt Joins the Parade 684732efb5799c0f78804c99d8de9aba -1 en Mac HE 62 - - khalek 6a30a07f353a75cdc602db27d73e1b42 -1 en Windows HE 70 - - khalek - 31aa57f460a3d12429f0552a46a90b39 6150 en DOS Demo Demo - + 31aa57f460a3d12429f0552a46a90b39 6150 en DOS Demo Demo - f40a7f495f59188ca57a9d1d50301bb6 -1 en Mac HE 60 Demo - khalek 37ff1b308999c4cca7319edfcc1280a0 8269 en Windows HE 70 Demo - khalek @@ -834,7 +835,7 @@ PuttTime Putt-Putt Travels Through Time 59d5cfcc5e672a6e07baae01328b918b -1 fr All HE 90 Demo - Kirben fbb697d89d2beca87360a145f467bdae -1 de All HE 90 Demo - Joachim Eberhard 6b19d0e25cbf720d05822379b8b90ed9 -1 nl All HE 90 Demo - adutchguy - 0a6d7b81b850ed4a77811c60c9b5c555 18458 us Windows HE 99 Mini Game - eriktorbjorn + 0a6d7b81b850ed4a77811c60c9b5c555 18458 us Windows HE 99 Mini Game - eriktorbjorn a71014c53a6d18c66ef2ea0ee42328e9 18458 nl Windows HE 99 Mini Game - Ben Castricum 8dd4d590685c19bf651b5016e749ead2 18458 fr Windows HE 99 Mini Game - Ben Castricum aef415cc5dc063e3668359c2657169f3 18458 de Windows HE 99 Mini Game - Ben Castricum @@ -859,16 +860,16 @@ dog Putt-Putt and Pep's Dog on a Stick d4b8ee426b1afd3e53bc0cf020418cf6 -1 en Windows HE 99 - - sev activity Putt-Putt & Fatty Bear's Activity Pack - 2c04aacffb8428f30ccf4f734fbe3adc -1 en DOS - - - Kirben + 2c04aacffb8428f30ccf4f734fbe3adc -1 en DOS - - - Kirben 0e96ab45a4eb72acc1b46813976589fd -1 en Mac - - - Kirben - b628506f7def772e40de0aa5440fb8e1 -1 en Windows HE 70 - - Kirben + b628506f7def772e40de0aa5440fb8e1 -1 en Windows HE 70 - - Kirben funpack Putt-Putt's Fun Pack 8afb3cf9f95abf208358e984f0c9e738 -1 en 3DO - - - sev e95cf980719c0be078fb68a67af97b4a -1 jp 3DO - - - clone2727 3d219e7546039543307b55a91282bf18 -1 en DOS - - - iziku 46b53fd430adcfbed791b48a0d4b079f -1 en DOS - - - khalek - 90a329d8ad5b7ce0690429e98cfbb32f -1 he DOS - - - + 90a329d8ad5b7ce0690429e98cfbb32f -1 he DOS - - - PuttsFunShop Putt-Putt's One-Stop Fun Shop 5262a27afcaee04e5c4900220bd463e7 -1 us All - - - Kirben @@ -922,7 +923,7 @@ spyozon SPY Fox 3: Operation Ozone 10d8e66cd11049ce64815ebb9fd76eb3 -1 fr All - - - gist974, ThierryFR 96a3069a3c63caa7329588ce1fef41ee -1 ru All - - - sev 7015b059ab72cff3a0ef9fb4d5e9889d -1 de Windows - - - andy482 - be39a5d4db60e8aa736b9086778cb45c -1 gb Windows - - - + be39a5d4db60e8aa736b9086778cb45c -1 gb Windows - - - ebd0b2c8a387f18887282afe6cad894a 15317 us All - Demo - Kirben a99c39ba65b6086be28aef576da69595 -1 fr Windows - Demo - Mevi diff --git a/devtools/update-version.pl b/devtools/update-version.pl index 337bad3e6c..3b5f892c3f 100755 --- a/devtools/update-version.pl +++ b/devtools/update-version.pl @@ -37,6 +37,7 @@ my @subs_files = qw( dists/scummvm.rc dists/slackware/scummvm.SlackBuild dists/macosx/Info.plist + dists/macosx/dockplugin/Info.plist dists/iphone/Info.plist dists/ios7/Info.plist dists/irix/scummvm.spec diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist index 7f6170294a..ce05e079df 100644 --- a/dists/macosx/Info.plist +++ b/dists/macosx/Info.plist @@ -53,7 +53,9 @@ <key>NSPrincipalClass</key> <string>NSApplication</string> <key>SUFeedURL</key> - <string>http://www.scummvm.org/appcasts/macosx/release.xml</string> + <string>https://www.scummvm.org/appcasts/macosx/release.xml</string> + <key>NSDockTilePlugIn</key> + <string>scummvm.docktileplugin</string> <key>SUPublicDSAKeyFile</key> <string>dsa_pub.pem</string> </dict> diff --git a/dists/macosx/Info.plist.in b/dists/macosx/Info.plist.in index 55be27d77b..c5f54fe3f0 100644 --- a/dists/macosx/Info.plist.in +++ b/dists/macosx/Info.plist.in @@ -53,7 +53,9 @@ <key>NSPrincipalClass</key> <string>NSApplication</string> <key>SUFeedURL</key> - <string>http://www.scummvm.org/appcasts/macosx/release.xml</string> + <string>https://www.scummvm.org/appcasts/macosx/release.xml</string> + <key>NSDockTilePlugIn</key> + <string>scummvm.docktileplugin</string> <key>SUPublicDSAKeyFile</key> <string>dsa_pub.pem</string> </dict> diff --git a/dists/macosx/dockplugin/Info.plist b/dists/macosx/dockplugin/Info.plist new file mode 100644 index 0000000000..c66f96a6b9 --- /dev/null +++ b/dists/macosx/dockplugin/Info.plist @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>ScummVMDockTilePlugin</string> + <key>CFBundleSignature</key> + <string>????</string> + <key>CFBundleIdentifier</key> + <string>org.scummvm.scummvm.DockTilePlugin</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundlePackageType</key> + <string>BNDL</string> + <key>CFBundleShortVersionString</key> + <string>1.9.0git</string> + <key>CFBundleVersion</key> + <string>1.9.0git</string> + <key>NSHumanReadableCopyright</key> + <string>Copyright 2001-2016 The ScummVM Team</string> + <key>NSPrincipalClass</key> + <string>ScummVMDockTilePlugIn</string> +</dict> +</plist> diff --git a/dists/macosx/dockplugin/Info.plist.in b/dists/macosx/dockplugin/Info.plist.in new file mode 100644 index 0000000000..851fc70f11 --- /dev/null +++ b/dists/macosx/dockplugin/Info.plist.in @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>ScummVMDockTilePlugin</string> + <key>CFBundleSignature</key> + <string>????</string> + <key>CFBundleIdentifier</key> + <string>org.scummvm.scummvm.DockTilePlugin</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundlePackageType</key> + <string>BNDL</string> + <key>CFBundleShortVersionString</key> + <string>@VERSION@</string> + <key>CFBundleVersion</key> + <string>@VERSION@</string> + <key>NSHumanReadableCopyright</key> + <string>Copyright 2001-2016 The ScummVM Team</string> + <key>NSPrincipalClass</key> + <string>ScummVMDockTilePlugIn</string> +</dict> +</plist> diff --git a/dists/macosx/dsa_pub.pem b/dists/macosx/dsa_pub.pem new file mode 100644 index 0000000000..13eb86201b --- /dev/null +++ b/dists/macosx/dsa_pub.pem @@ -0,0 +1,36 @@ +-----BEGIN PUBLIC KEY----- +MIIGOjCCBC0GByqGSM44BAEwggQgAoICAQDMnJLkF6tYuyGHM92pO49c0SV927yl +g4uteavJXH/AgJlSr/YmouiK5KrWBPoe5gQsxbFjmrt9L8ocwu9OCxNZHlifv7l0 +V4GbBfk11usFjRZXuIS/7N4RPBe0VDuhBoMdViGPBLCUsC/cmOOz4VtiyS1kW0WL +G2AwWzBT/Zzo4/cDMCys8VBIZjZnjyzxi9u374GdZYNlQ7ts6DbvIxheFBuFG7cg ++XeuB4fz9no1riKM9zEhXtbJJG18/61yvcUj4rOcEYPBFbUXesvuZalVVzYGzZ1G +p39tuAOK6S7W/AzWeDlAGYAOaMvAukAWTSIj/UeuAPPlnaXQLeZ59+7Fbcc7dvMc +SIngNszKbmqTPCAOjE1RWUbFoujxEMcoog0iBKNLvgnC9HEL9sfMNma2107xulf6 +ywcHFLC3f8O8RfTBnU4Q8jwI6pY46w5nZ3lmcDpVqF3OGE71z+OPBkVBJpyiRwFJ +tuCBy4Fc/Vza0QFixoxhREAfxNVza1wrN7DNIFnuhvUM1BwPHx9QvvGAOYJGr+E5 +lrnbpmqYW5icWT/LW+1wlSYTnZeXGTSJFq6Chi6nUyeUov5KdCfJbBu17V727Sj2 +6TKM2HCrE8VmTYSBG99i+2QHhXkV6gOv6reT5lzvzz0BPWRpx9jr48yWU8FxskSE +5z+GxzBYjqY0+QIVAO2l1PedCvhUPXWR7W4cLPo7na3dAoICACW1k1Omwf60vLnG +wmxb6hRV44k3UQ/7pwAIGTsepO0caU/5t5lWnmkPnGliXAe7MkJ5Is3aQFdV0kA8 +b0pBsZCpDW3qnJmSJtnO+21n5HMv2b3MFuzvEOCKXNt8RkJxeK/HaLSPQcMH/1GT +4tCfX7FXZi2VsrV5HxllEVdhMzGC3HBmgXxmO98iVAT9rTfmxqEPwysL/i5DrTXr +6SCLLYF7BR3bRVjp8y4jmIrGCDS+zqUgbWZR81sd3XcO05TLZr/xxBlY/jZYDbjr +VG53lIzHTnWp5nugl9CyXrcnzyvDpM/UaiPXxGPXYuK5X4+Kjo937ZegyNWULx6G ++CbcAbFy6R5KtObj9sInnnLjAt2+pIkUxhl8YZnOTraiRBWgnFAxVjTzEYjwlUF8 +gbg8NnAmLQkr/uWtpxdZ2d81pvlrIj0Y3ltzVPx7h5KyXpKItWm08HdPcYiCSXz8 +TIrioSTUcN0ISspsaujmNlAXMeMidrWLXUwL5fMuZ00p7w8gakgUMqbmeEvTkyJO +iGX5cMqXLp7AXEVFpKzCWg9ebuAWZTkI2v8Kkf466EhIB6OUeeHwWTXpU5Ar8ckU +MCc+FV9cpe+wQv7AN6SdXamUyJySJ07zcDwXHxpXIq32bANAWO/ZrebcLi5AUOs0 +rmiOk+ET2LzzfJjnmBnb0lELrvzbA4ICBQACggIAXh4VEPZbBDyfCvGDTGIjxxs9 +0uApTVBVyAzHTQ+J9OKsaoqbMF8QADczTXaE0ycaZZDcq1jHeAkL/UwAfm1gRyhn +jIWX+quZHv1hI2r114gxkvwa8FNvQKffkeYZ9r7NsCyuhBlSHbFuNgYbByTZ16v6 +s0KfMPgTVMb5LANDD6SwUhb8ggvbEnWrO8l6Cn8tKaCwSVfYF37cECCoqc+yLW+S +0rvJxr/aULAGuEBTA3uwuFOMhWveRNbRqOOfqvOkdGFyUL1zjmNEHNx7qJNU2sni +BbU2DQd01s6uPyWQOXXm77VG1TQo4Z2+OVZSvS8oyNRJaXmqfKf72rW14GERSb40 +qEL6RlltWjPw5Kezv/OdOrE6vKO2uprvpSkOARm9W2jJbJm9hpXvyHUljxJOkYR2 +VxCMVO74DbhDKFuh115wMy2g/FoDy/QbbvgsKOWgBNkgp+xbclo4bJdmvzihwScy +hCeCKKzQDZtu9JSaUnOMvx3hjL7hMAzjRP92Cmly0YoRNuLqzX4OqPTr/Si5au0C +/IiySlBxPUkoP1HQVXm9vU4pI4D/ViDJpXx2UKN9/nFQW1exC/n1TeGavnuT4HY1 +vAt/3wPz3asTCBIULmqGOEsgOo3nN3pfnBmmGDjUWg8i79RNCbLgLkcMtJ0F1xvq +pYCWvL3Wewrmz0Yc790= +-----END PUBLIC KEY----- diff --git a/dists/macosx/scummvm_appcast.xml b/dists/macosx/scummvm_appcast.xml new file mode 100644 index 0000000000..a4a15a23f6 --- /dev/null +++ b/dists/macosx/scummvm_appcast.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <channel> + <title>ScummVM Changelog</title> + <link>https://www.scummvm.org/scummvm_appcast.xml</link> + <description>Most recent changes with links to updates.</description> + <language>en</language> + <item> + <title>Version 1.8.0</title> + <sparkle:releaseNotesLink> + https://scummvm.org/frs/scummvm/1.8.0/ReleaseNotes + </sparkle:releaseNotesLink> + <pubDate>Sat, 5 Mar 2016 20:16:00 +0000</pubDate> + <enclosure url="https://www.scummvm.org/frs/scummvm/1.8.0/scummvm-1.8.0-macosx.dmg" + sparkle:version="1.8.0" length="14085288" type="application/octet-stream" + sparkle:dsaSignature="MC0CFQDNy2yox7vklthHaZcMto8L4EuLwQIUY8cuevlTpLtuJ9nPOlrj4vo55lY=" /> + <enclosure sparkle:os="windows" + url="https://www.scummvm.org/frs/scummvm/1.8.0/scummvm-1.8.0-win32.exe" + sparkle:version="1.8.0" length="9081062" type="application/octet-stream" + sparkle:dsaSignature="MC0CFQCaG7Oo+Nc2EWVmc7GjUBJLKRvt3QIUQcZTMe2FQhfvrrofX4HLTldDHyY=" /> + </item> + <item> + <title>Version 1.7.0</title> + <sparkle:releaseNotesLink> + https://www.scummvm.org/frs/scummvm/1.7.0/ReleaseNotes + </sparkle:releaseNotesLink> + <pubDate>Tue, 29 Jul 2014 07:58:00 +0000</pubDate> + <link>https://www.scummvm.org/frs/scummvm/1.7.0/</link> + </item> + </channel> +</rss> diff --git a/dists/macosx/scummvm_osx_appcast.xml b/dists/macosx/scummvm_osx_appcast.xml deleted file mode 100644 index 455b062b6b..0000000000 --- a/dists/macosx/scummvm_osx_appcast.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <channel> - <title>ScummVM Changelog</title> - <link>http://scummvm.org/scummvm_appcast.xml</link> - <description>Most recent changes with links to updates.</description> - <language>en</language> - <item> - <title>Version 1.2.1 (3 bugs fixed; 2 new features)</title> - <sparkle:releaseNotesLink> - http://sourceforge.net/projects/scummvm/files/scummvm/1.2.1/ReleaseNotes/view - </sparkle:releaseNotesLink> - <pubDate>Sun, 19 Dec 2010 12:20:11 +0000</pubDate> - <enclosure url="http://scummvm.org/ScummVM 1.2.1-Test.zip" sparkle:version="1.2.1" length="1472893" type="application/octet-stream" sparkle:dsaSignature="234818feCa1JyW30nbkBwainOzrN6EQuAh" /> - </item> - <item> - <title>Version 1.2.0</title> - <sparkle:releaseNotesLink> - http://sourceforge.net/projects/scummvm/files/scummvm/1.2.0/ReleaseNotes/view - </sparkle:releaseNotesLink> - <pubDate>Fri, 15 Oct 2010 12:20:11 +0000</pubDate> - <enclosure url="http://scummvm.org/ScummVM 1.2.0-Test.zip" sparkle:version="1.2.0" length="1472893" type="application/octet-stream" sparkle:dsaSignature="234818feCa1JyW30nbkBwainOzrN6EQuAh" /> - </item> - </channel> -</rss> diff --git a/doc/de/Neues b/doc/de/Neues index ef462c189c..73b4dc8d91 100644 --- a/doc/de/Neues +++ b/doc/de/Neues @@ -4,13 +4,56 @@ Programmcodes finden Sie auf Englisch unter: 1.9.0 (DD.MM.YYYY) AGI: - - UnterstУМtzung fУМr Hercules-Darstellung (GrУМn + Bernstein) hinzugefУМgt + - UnterstУМtzung fУМr Hercules-Darstellung (GrУМn + Bernstein) hinzugefУМgt. - UnterstУМtzung fУМr hochauflУЖsende Hercules-Schriftart hinzugefУМgt - (auch auУerhalb der Hercules-Darstellung nutzbar) + (auch auУerhalb der Hercules-Darstellung nutzbar). - Optionale Funktion "Pause, wenn Befehle eingegeben werden" hinzugefУМgt. Diese Funktion war im originalen Interpreter nur im Hercules-Darstellungsmodus verfУМgbar. +1.8.1 (DD.MM.YYYY) + Allgemein: + - "TESTING"-Markierung von mehreren unterstУМtzten Spielen entfernt. + - Chinesische Уbersetzung (Pinyin) der BenutzeroberflУЄche hinzugefУМgt. + + BBVS: + - Fehler beim erneuten Starten des Spiels behoben. + + CinE: + - Fehler beim Laden der Soundeffekte behoben. + + Gob: + - AufhУЄngen wУЄhrend Sound-Initialisierung in mehreren Spielen behoben. + + Lab: + - AufhУЄngen wУЄhrend der End-Sequenz behoben. + - Interne Spiel-Bedienelemente verbessert. + + SAGA: + - Fehlerhafte Farben der Bedienelemente in der franzУЖsischen und deutschen + Version von "I Have No Mouth and I Must Screm" korrigiert. + + SCUMM: + - Erkennung von Maniac Mansion innerhalb von Day of the Tentacle in der + Windows-Version von ScummVM repariert. + - In der EGA-Version von Loom wurde ein Sound-Effekt nicht korrekt angehalten, + wenn AdLib verwendet wurde. Dieser Fehler wurde behoben. + + Baphomets Fluch 2.5: + - Option zur Auswahl von englischer Sprachausgabe anstelle der deutschen, + wenn in der gewУЄhlten Sprache keine Sprachausgabe verfУМgbar ist, hinzugefУМgt. + - Ressourcen-Freigabe beim Beenden des Spiels korrigiert. + - Fehler beim Neustart des Spiels nach dem Wechsel der Spiel-Sprache behoben. + - Flackern im HauptmenУМ behoben. + - Lange Dauer des Speichervorgangs unter Windows behoben. + + Windows-Portierung: + - Absturz im Zusammenhang mit nicht-funktionierenden MIDI-GerУЄten behoben. + + Mac OS X-Portierung: + - Das Dock-MenУМ fУМr ScummVM enthУЄlt nun eine Liste der zuletzt gespielten Spiele, + wenn ScummVM nicht lУЄuft, und ermУЖglicht den direkten Start dieser Spiele. + - Sparkle-Updater fУМr vereinfachte Programmaktualisierungen hinzugefУМgt. 1.8.0 (04.03.2016) Neue Spiele: @@ -66,7 +109,7 @@ Neue Portierungen: (verwendet von Mixed Up Mother Goose). - Feste VerzУЖgerung von 2 Sekunden bei Raumwechseln entfernt und durch Heuristik ersetzt. - - Fehlerhafte Tastenbelegungen nach abspeichern/laden behoben + - Fehlerhafte Tastenbelegungen nach abspeichern/laden behoben. AGOS: - Arpeggio-Effekt in der Musik der Amiga-Version von Elvira 1 repariert. @@ -78,7 +121,7 @@ Neue Portierungen: AdLib-Ausgabe erheblich und erhУЖht die Originaltreue. Baphomets Fluch 1: - - Sprachausgabe in Macintosh-Versionen korrigiert, wenn ScumMVM + - Sprachausgabe in Macintosh-Versionen korrigiert, wenn ScummVM auf Big-Endian-Systemen ausgefУМhrt wird. - Fehler beim Laden eines Spielstandes aus dem HauptmenУМ in der Bull's Head Hill-Szene korrigiert. Dieser Fehler trat womУЖglich auch diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp new file mode 100644 index 0000000000..1ab74c3cf6 --- /dev/null +++ b/engines/adl/adl.cpp @@ -0,0 +1,1038 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "common/scummsys.h" +#include "common/config-manager.h" +#include "common/debug.h" +#include "common/error.h" +#include "common/file.h" +#include "common/system.h" +#include "common/events.h" +#include "common/stream.h" +#include "common/savefile.h" + +#include "engines/util.h" + +#include "graphics/palette.h" +#include "graphics/thumbnail.h" + +#include "adl/adl.h" +#include "adl/display.h" +#include "adl/detection.h" + +namespace Adl { + +AdlEngine::~AdlEngine() { + delete _display; +} + +AdlEngine::AdlEngine(OSystem *syst, const AdlGameDescription *gd) : + Engine(syst), + _display(nullptr), + _gameDescription(gd), + _isRestarting(false), + _isRestoring(false), + _saveVerb(0), + _saveNoun(0), + _restoreVerb(0), + _restoreNoun(0), + _canSaveNow(false), + _canRestoreNow(false) { +} + +Common::String AdlEngine::readString(Common::ReadStream &stream, byte until) const { + Common::String str; + + while (1) { + byte b = stream.readByte(); + + if (stream.eos() || stream.err()) + error("Error reading string"); + + if (b == until) + break; + + str += b; + }; + + return str; +} + +Common::String AdlEngine::readStringAt(Common::SeekableReadStream &stream, uint offset, byte until) const { + stream.seek(offset); + return readString(stream, until); +} + +void AdlEngine::printMessage(uint idx, bool wait) const { + Common::String msg = _messages[idx - 1]; + wordWrap(msg); + _display->printString(msg); + + if (wait) + delay(14 * 166018 / 1000); +} + +void AdlEngine::delay(uint32 ms) const { + Common::EventManager *ev = g_system->getEventManager(); + + uint32 start = g_system->getMillis(); + + while (!g_engine->shouldQuit() && g_system->getMillis() - start < ms) { + Common::Event event; + if (ev->pollEvent(event)) { + if (event.type == Common::EVENT_KEYDOWN && (event.kbd.flags & Common::KBD_CTRL)) { + switch(event.kbd.keycode) { + case Common::KEYCODE_q: + g_engine->quitGame(); + break; + default: + break; + } + } + } + g_system->delayMillis(16); + } +} + +Common::String AdlEngine::inputString(byte prompt) const { + Common::String s; + + if (prompt > 0) + _display->printString(Common::String(prompt)); + + while (1) { + byte b = inputKey(); + + if (g_engine->shouldQuit() || _isRestoring) + return 0; + + if (b == 0) + continue; + + if (b == ('\r' | 0x80)) { + s += b; + _display->printString(Common::String(b)); + return s; + } + + if (b < 0xa0) { + switch (b) { + case Common::KEYCODE_BACKSPACE | 0x80: + if (!s.empty()) { + _display->moveCursorBackward(); + _display->setCharAtCursor(APPLECHAR(' ')); + s.deleteLastChar(); + } + break; + }; + } else { + if (s.size() < 255) { + s += b; + _display->printString(Common::String(b)); + } + } + } +} + +byte AdlEngine::inputKey() const { + Common::EventManager *ev = g_system->getEventManager(); + + byte key = 0; + + _display->showCursor(true); + + while (!g_engine->shouldQuit() && !_isRestoring && key == 0) { + Common::Event event; + if (ev->pollEvent(event)) { + if (event.type != Common::EVENT_KEYDOWN) + continue; + + if (event.kbd.flags & Common::KBD_CTRL) { + if (event.kbd.keycode == Common::KEYCODE_q) + g_engine->quitGame(); + continue; + } + + switch (event.kbd.keycode) { + case Common::KEYCODE_BACKSPACE: + case Common::KEYCODE_RETURN: + key = convertKey(event.kbd.keycode); + break; + default: + if (event.kbd.ascii >= 0x20 && event.kbd.ascii < 0x80) + key = convertKey(event.kbd.ascii); + }; + } + + _display->updateTextScreen(); + g_system->delayMillis(16); + } + + _display->showCursor(false); + + return key; +} + +void AdlEngine::loadWords(Common::ReadStream &stream, WordMap &map) const { + uint index = 0; + + while (1) { + ++index; + + byte buf[IDI_WORD_SIZE]; + + if (stream.read(buf, IDI_WORD_SIZE) < IDI_WORD_SIZE) + error("Error reading word list"); + + Common::String word((char *)buf, IDI_WORD_SIZE); + + if (!map.contains(word)) + map[word] = index; + + byte synonyms = stream.readByte(); + + if (stream.err() || stream.eos()) + error("Error reading word list"); + + if (synonyms == 0xff) + break; + + for (uint i = 0; i < synonyms; ++i) { + if (stream.read((char *)buf, IDI_WORD_SIZE) < IDI_WORD_SIZE) + error("Error reading word list"); + + word = Common::String((char *)buf, IDI_WORD_SIZE); + + if (!map.contains(word)) + map[word] = index; + } + } +} + +void AdlEngine::readCommands(Common::ReadStream &stream, Commands &commands) { + while (1) { + Command command; + command.room = stream.readByte(); + + if (command.room == 0xff) + return; + + command.verb = stream.readByte(); + command.noun = stream.readByte(); + + byte scriptSize = stream.readByte() - 6; + + command.numCond = stream.readByte(); + command.numAct = stream.readByte(); + + for (uint i = 0; i < scriptSize; ++i) + command.script.push_back(stream.readByte()); + + if (stream.eos() || stream.err()) + error("Failed to read commands"); + + if (command.numCond == 0 && command.script[0] == IDO_ACT_SAVE) { + _saveVerb = command.verb; + _saveNoun = command.noun; + } + + if (command.numCond == 0 && command.script[0] == IDO_ACT_LOAD) { + _restoreVerb = command.verb; + _restoreNoun = command.noun; + } + + commands.push_back(command); + } +} + +Common::Error AdlEngine::run() { + _display = new Display(); + + loadData(); + + int saveSlot = ConfMan.getInt("save_slot"); + if (saveSlot >= 0) { + if (loadGameState(saveSlot).getCode() != Common::kNoError) + error("Failed to load save game from slot %i", saveSlot); + _display->moveCursorTo(Common::Point(0, 23)); + _isRestoring = true; + } else { + runIntro(); + initState(); + } + + _display->setMode(DISPLAY_MODE_MIXED); + _display->printAsciiString("\r\r\r\r\r"); + + while (1) { + uint verb = 0, noun = 0; + + // When restoring from the launcher, we don't read + // input on the first iteration. This is needed to + // ensure that restoring from the launcher and + // restoring in-game brings us to the same game state. + // (Also see comment below.) + if (!_isRestoring) { + clearScreen(); + showRoom(); + + _canSaveNow = _canRestoreNow = true; + getInput(verb, noun); + _canSaveNow = _canRestoreNow = false; + + if (shouldQuit()) + break; + + // If we just restored from the GMM, we skip this command + // set, as no command has been input by the user + if (!_isRestoring) + if (!doOneCommand(_roomCommands, verb, noun)) + printMessage(_messageIds.dontUnderstand); + } + + if (_isRestoring) { + // We restored from the GMM or launcher. As restoring + // with "RESTORE GAME" does not end command processing, + // we don't break it off here either. This essentially + // means that restoring a game will always run through + // the global commands and increase the move counter + // before the first user input. + _display->printAsciiString("\r"); + _isRestoring = false; + verb = _restoreVerb; + noun = _restoreNoun; + } + + // Restarting does end command processing + if (_isRestarting) { + _isRestarting = false; + continue; + } + + doAllCommands(_globalCommands, verb, noun); + _state.moves++; + } + + return Common::kNoError; +} + +bool AdlEngine::hasFeature(EngineFeature f) const { + switch (f) { + case kSupportsLoadingDuringRuntime: + case kSupportsSavingDuringRuntime: + case kSupportsRTL: + return true; + default: + return false; + } +} + +Common::Error AdlEngine::loadGameState(int slot) { + Common::String fileName = Common::String::format("%s.s%02d", _targetName.c_str(), slot); + Common::InSaveFile *inFile = getSaveFileManager()->openForLoading(fileName); + + if (!inFile) { + warning("Failed to open file '%s'", fileName.c_str()); + return Common::kUnknownError; + } + + if (inFile->readUint32BE() != MKTAG('A', 'D', 'L', ':')) { + warning("No header found in '%s'", fileName.c_str()); + delete inFile; + return Common::kUnknownError; + } + + byte saveVersion = inFile->readByte(); + if (saveVersion != SAVEGAME_VERSION) { + warning("Save game version %i not supported", saveVersion); + delete inFile; + return Common::kUnknownError; + } + + // Skip description + inFile->seek(SAVEGAME_NAME_LEN, SEEK_CUR); + // Skip save time + inFile->seek(6, SEEK_CUR); + + uint32 playTime = inFile->readUint32BE(); + + Graphics::skipThumbnail(*inFile); + + initState(); + + _state.room = inFile->readByte(); + _state.moves = inFile->readByte(); + _state.isDark = inFile->readByte(); + + uint32 size = inFile->readUint32BE(); + if (size != _state.rooms.size()) + error("Room count mismatch (expected %i; found %i)", _state.rooms.size(), size); + + for (uint i = 0; i < size; ++i) { + _state.rooms[i].picture = inFile->readByte(); + _state.rooms[i].curPicture = inFile->readByte(); + } + + size = inFile->readUint32BE(); + if (size != _state.items.size()) + error("Item count mismatch (expected %i; found %i)", _state.items.size(), size); + + for (uint i = 0; i < size; ++i) { + _state.items[i].room = inFile->readByte(); + _state.items[i].picture = inFile->readByte(); + _state.items[i].position.x = inFile->readByte(); + _state.items[i].position.y = inFile->readByte(); + _state.items[i].state = inFile->readByte(); + } + + size = inFile->readUint32BE(); + if (size != _state.vars.size()) + error("Variable count mismatch (expected %i; found %i)", _state.vars.size(), size); + + for (uint i = 0; i < size; ++i) + _state.vars[i] = inFile->readByte(); + + if (inFile->err() || inFile->eos()) + error("Failed to load game '%s'", fileName.c_str()); + + delete inFile; + + setTotalPlayTime(playTime); + + _isRestoring = true; + return Common::kNoError; +} + +bool AdlEngine::canLoadGameStateCurrently() { + return _canRestoreNow; +} + +Common::Error AdlEngine::saveGameState(int slot, const Common::String &desc) { + Common::String fileName = Common::String::format("%s.s%02d", _targetName.c_str(), slot); + Common::OutSaveFile *outFile = getSaveFileManager()->openForSaving(fileName); + + if (!outFile) { + warning("Failed to open file '%s'", fileName.c_str()); + return Common::kUnknownError; + } + + outFile->writeUint32BE(MKTAG('A', 'D', 'L', ':')); + outFile->writeByte(SAVEGAME_VERSION); + + char name[SAVEGAME_NAME_LEN] = { }; + + if (!desc.empty()) + strncpy(name, desc.c_str(), sizeof(name) - 1); + else { + Common::String defaultName("Save "); + defaultName += 'A' + slot; + strncpy(name, defaultName.c_str(), sizeof(name) - 1); + } + + outFile->write(name, sizeof(name)); + + TimeDate t; + g_system->getTimeAndDate(t); + + outFile->writeUint16BE(t.tm_year); + outFile->writeByte(t.tm_mon); + outFile->writeByte(t.tm_mday); + outFile->writeByte(t.tm_hour); + outFile->writeByte(t.tm_min); + + uint32 playTime = getTotalPlayTime(); + outFile->writeUint32BE(playTime); + + _display->saveThumbnail(*outFile); + + outFile->writeByte(_state.room); + outFile->writeByte(_state.moves); + outFile->writeByte(_state.isDark); + + outFile->writeUint32BE(_state.rooms.size()); + for (uint i = 0; i < _state.rooms.size(); ++i) { + outFile->writeByte(_state.rooms[i].picture); + outFile->writeByte(_state.rooms[i].curPicture); + } + + outFile->writeUint32BE(_state.items.size()); + for (uint i = 0; i < _state.items.size(); ++i) { + outFile->writeByte(_state.items[i].room); + outFile->writeByte(_state.items[i].picture); + outFile->writeByte(_state.items[i].position.x); + outFile->writeByte(_state.items[i].position.y); + outFile->writeByte(_state.items[i].state); + } + + outFile->writeUint32BE(_state.vars.size()); + for (uint i = 0; i < _state.vars.size(); ++i) + outFile->writeByte(_state.vars[i]); + + outFile->finalize(); + + if (outFile->err()) { + delete outFile; + warning("Failed to save game '%s'", fileName.c_str()); + return Common::kUnknownError; + } + + delete outFile; + return Common::kNoError; +} + +bool AdlEngine::canSaveGameStateCurrently() { + if (!_canSaveNow) + return false; + + Commands::const_iterator cmd; + + // Here we check whether or not the game currently accepts the command + // "SAVE GAME". This prevents saving via the GMM in situations where + // it wouldn't otherwise be possible to do so. + for (cmd = _roomCommands.begin(); cmd != _roomCommands.end(); ++cmd) { + uint offset; + if (matchCommand(*cmd, _saveVerb, _saveNoun, &offset)) + return cmd->script[offset] == IDO_ACT_SAVE; + } + + return false; +} + +void AdlEngine::wordWrap(Common::String &str) const { + uint end = 39; + + while (1) { + if (str.size() <= end) + return; + + while (str[end] != APPLECHAR(' ')) + --end; + + str.setChar(APPLECHAR('\r'), end); + end += 40; + } +} + +byte AdlEngine::convertKey(uint16 ascii) const { + ascii = toupper(ascii); + + if (ascii >= 0x80) + return 0; + + ascii |= 0x80; + + if (ascii >= 0x80 && ascii <= 0xe0) + return ascii; + + return 0; +} + +Common::String AdlEngine::getLine() const { + // Original engine uses a global here, which isn't reset between + // calls and may not match actual mode + bool textMode = false; + + while (1) { + Common::String line = inputString(APPLECHAR('?')); + + if (shouldQuit() || _isRestoring) + return ""; + + if ((byte)line[0] == ('\r' | 0x80)) { + textMode = !textMode; + _display->setMode(textMode ? DISPLAY_MODE_TEXT : DISPLAY_MODE_MIXED); + continue; + } + + // Remove the return + line.deleteLastChar(); + return line; + } +} + +Common::String AdlEngine::getWord(const Common::String &line, uint &index) const { + Common::String str; + + for (uint i = 0; i < 8; ++i) + str += APPLECHAR(' '); + + int copied = 0; + + // Skip initial whitespace + while (1) { + if (index == line.size()) + return str; + if (line[index] != APPLECHAR(' ')) + break; + ++index; + } + + // Copy up to 8 characters + while (1) { + if (copied < 8) + str.setChar(line[index], copied++); + + index++; + + if (index == line.size() || line[index] == APPLECHAR(' ')) + return str; + } +} + +void AdlEngine::getInput(uint &verb, uint &noun) { + while (1) { + _display->printString(_strings.enterCommand); + Common::String line = getLine(); + + if (shouldQuit() || _isRestoring) + return; + + uint index = 0; + Common::String verbStr = getWord(line, index); + + if (!_verbs.contains(verbStr)) { + Common::String err = _strings.verbError; + for (uint i = 0; i < verbStr.size(); ++i) + err.setChar(verbStr[i], i + 19); + _display->printString(err); + continue; + } + + verb = _verbs[verbStr]; + + Common::String nounStr = getWord(line, index); + + if (!_nouns.contains(nounStr)) { + Common::String err = _strings.nounError; + for (uint i = 0; i < verbStr.size(); ++i) + err.setChar(verbStr[i], i + 19); + for (uint i = 0; i < nounStr.size(); ++i) + err.setChar(nounStr[i], i + 30); + _display->printString(err); + continue; + } + + noun = _nouns[nounStr]; + return; + } +} + +void AdlEngine::showRoom() const { + if (!_state.isDark) { + drawPic(getCurRoom().curPicture); + drawItems(); + } + + _display->updateHiResScreen(); + printMessage(getCurRoom().description, false); +} + +void AdlEngine::clearScreen() const { + _display->setMode(DISPLAY_MODE_MIXED); + _display->clear(0x00); +} + +void AdlEngine::drawItems() const { + Common::Array<Item>::const_iterator item; + + uint dropped = 0; + + for (item = _state.items.begin(); item != _state.items.end(); ++item) { + if (item->room != _state.room) + continue; + + if (item->state == IDI_ITEM_MOVED) { + if (getCurRoom().picture == getCurRoom().curPicture) { + const Common::Point &p = _itemOffsets[dropped]; + if (item->isLineArt) + drawLineArt(_lineArt[item->picture - 1], p); + else + drawPic(item->picture, p); + ++dropped; + } + continue; + } + + Common::Array<byte>::const_iterator pic; + + for (pic = item->roomPictures.begin(); pic != item->roomPictures.end(); ++pic) { + if (*pic == getCurRoom().curPicture) { + if (item->isLineArt) + drawLineArt(_lineArt[item->picture - 1], item->position); + else + drawPic(item->picture, item->position); + continue; + } + } + } +} + +void AdlEngine::drawNextPixel(Common::Point &p, byte color, byte bits, byte quadrant) const { + if (bits & 4) + _display->putPixel(p, color); + + bits += quadrant; + + if (bits & 1) + p.x += (bits & 2 ? -1 : 1); + else + p.y += (bits & 2 ? 1 : -1); +} + +void AdlEngine::drawLineArt(const Common::Array<byte> &lineArt, const Common::Point &pos, byte rotation, byte scaling, byte color) const { + const byte stepping[] = { + 0xff, 0xfe, 0xfa, 0xf4, 0xec, 0xe1, 0xd4, 0xc5, + 0xb4, 0xa1, 0x8d, 0x78, 0x61, 0x49, 0x31, 0x18, + 0xff + }; + + byte quadrant = rotation >> 4; + rotation &= 0xf; + byte xStep = stepping[rotation]; + byte yStep = stepping[(rotation ^ 0xf) + 1] + 1; + + Common::Point p(pos); + + for (uint i = 0; i < lineArt.size(); ++i) { + byte b = lineArt[i]; + + do { + byte xFrac = 0x80; + byte yFrac = 0x80; + for (uint j = 0; j < scaling; ++j) { + if (xFrac + xStep + 1 > 255) + drawNextPixel(p, color, b, quadrant); + xFrac += xStep + 1; + if (yFrac + yStep > 255) + drawNextPixel(p, color, b, quadrant + 1); + yFrac += yStep; + } + b >>= 3; + } while (b != 0); + } +} + +const Room &AdlEngine::getRoom(uint i) const { + if (i < 1 || i > _state.rooms.size()) + error("Room %i out of range [1, %i]", i, _state.rooms.size()); + + return _state.rooms[i - 1]; +} + +Room &AdlEngine::getRoom(uint i) { + if (i < 1 || i > _state.rooms.size()) + error("Room %i out of range [1, %i]", i, _state.rooms.size()); + + return _state.rooms[i - 1]; +} + +const Room &AdlEngine::getCurRoom() const { + return getRoom(_state.room); +} + +Room &AdlEngine::getCurRoom() { + return getRoom(_state.room); +} + +const Item &AdlEngine::getItem(uint i) const { + if (i < 1 || i > _state.items.size()) + error("Item %i out of range [1, %i]", i, _state.items.size()); + + return _state.items[i - 1]; +} + +Item &AdlEngine::getItem(uint i) { + if (i < 1 || i > _state.items.size()) + error("Item %i out of range [1, %i]", i, _state.items.size()); + + return _state.items[i - 1]; +} + +byte AdlEngine::getVar(uint i) const { + if (i >= _state.vars.size()) + error("Variable %i out of range [0, %i]", i, _state.vars.size() - 1); + + return _state.vars[i]; +} + +void AdlEngine::setVar(uint i, byte value) { + if (i >= _state.vars.size()) + error("Variable %i out of range [0, %i]", i, _state.vars.size() - 1); + + _state.vars[i] = value; +} + +void AdlEngine::takeItem(byte noun) { + Common::Array<Item>::iterator item; + + for (item = _state.items.begin(); item != _state.items.end(); ++item) { + if (item->noun != noun || item->room != _state.room) + continue; + + if (item->state == IDI_ITEM_DOESNT_MOVE) { + printMessage(_messageIds.itemDoesntMove); + return; + } + + if (item->state == IDI_ITEM_MOVED) { + item->room = IDI_NONE; + return; + } + + Common::Array<byte>::const_iterator pic; + for (pic = item->roomPictures.begin(); pic != item->roomPictures.end(); ++pic) { + if (*pic == getCurRoom().curPicture) { + item->room = IDI_NONE; + item->state = IDI_ITEM_MOVED; + return; + } + } + } + + printMessage(_messageIds.itemNotHere); +} + +void AdlEngine::dropItem(byte noun) { + Common::Array<Item>::iterator item; + + for (item = _state.items.begin(); item != _state.items.end(); ++item) { + if (item->noun != noun || item->room != IDI_NONE) + continue; + + item->room = _state.room; + item->state = IDI_ITEM_MOVED; + return; + } + + printMessage(_messageIds.dontUnderstand); +} + +#define ARG(N) (command.script[offset + (N)]) + +bool AdlEngine::matchCommand(const Command &command, byte verb, byte noun, uint *actions) const { + if (command.room != IDI_NONE && command.room != _state.room) + return false; + + if (command.verb != IDI_NONE && command.verb != verb) + return false; + + if (command.noun != IDI_NONE && command.noun != noun) + return false; + + uint offset = 0; + for (uint i = 0; i < command.numCond; ++i) { + switch (ARG(0)) { + case IDO_CND_ITEM_IN_ROOM: + if (getItem(ARG(1)).room != ARG(2)) + return false; + offset += 3; + break; + case IDO_CND_MOVES_GE: + if (ARG(1) > _state.moves) + return false; + offset += 2; + break; + case IDO_CND_VAR_EQ: + if (getVar(ARG(1)) != ARG(2)) + return false; + offset += 3; + break; + case IDO_CND_CUR_PIC_EQ: + if (getCurRoom().curPicture != ARG(1)) + return false; + offset += 2; + break; + case IDO_CND_ITEM_PIC_EQ: + if (getItem(ARG(1)).picture != ARG(2)) + return false; + offset += 3; + break; + default: + error("Invalid condition opcode %02x", command.script[offset]); + } + } + + if (actions) + *actions = offset; + + return true; +} + +void AdlEngine::doActions(const Command &command, byte noun, byte offset) { + for (uint i = 0; i < command.numAct; ++i) { + switch (ARG(0)) { + case IDO_ACT_VAR_ADD: + setVar(ARG(2), getVar(ARG(2) + ARG(1))); + offset += 3; + break; + case IDO_ACT_VAR_SUB: + setVar(ARG(2), getVar(ARG(2)) - ARG(1)); + offset += 3; + break; + case IDO_ACT_VAR_SET: + setVar(ARG(1), ARG(2)); + offset += 3; + break; + case IDO_ACT_LIST_ITEMS: { + Common::Array<Item>::const_iterator item; + + for (item = _state.items.begin(); item != _state.items.end(); ++item) + if (item->room == IDI_NONE) + printMessage(item->description); + + ++offset; + break; + } + case IDO_ACT_MOVE_ITEM: + getItem(ARG(1)).room = ARG(2); + offset += 3; + break; + case IDO_ACT_SET_ROOM: + getCurRoom().curPicture = getCurRoom().picture; + _state.room = ARG(1); + offset += 2; + break; + case IDO_ACT_SET_CUR_PIC: + getCurRoom().curPicture = ARG(1); + offset += 2; + break; + case IDO_ACT_SET_PIC: + getCurRoom().picture = getCurRoom().curPicture = ARG(1); + offset += 2; + break; + case IDO_ACT_PRINT_MSG: + printMessage(ARG(1)); + offset += 2; + break; + case IDO_ACT_SET_LIGHT: + _state.isDark = false; + ++offset; + break; + case IDO_ACT_SET_DARK: + _state.isDark = true; + ++offset; + break; + case IDO_ACT_SAVE: + saveGameState(0, ""); + ++offset; + break; + case IDO_ACT_LOAD: + loadGameState(0); + ++offset; + // Original engine does not jump out of the loop, + // so we don't either. + // We reset the restore flag, as the restore game + // process is complete + _isRestoring = false; + break; + case IDO_ACT_RESTART: { + _display->printString(_strings.playAgain); + Common::String input = inputString(); + if (input.size() == 0 || input[0] != APPLECHAR('N')) { + _isRestarting = true; + _display->clear(0x00); + _display->updateHiResScreen(); + restartGame(); + return; + } + // Fall-through + } + case IDO_ACT_QUIT: + printMessage(_messageIds.thanksForPlaying); + quitGame(); + return; + case IDO_ACT_PLACE_ITEM: + getItem(ARG(1)).room = ARG(2); + getItem(ARG(1)).position.x = ARG(3); + getItem(ARG(1)).position.y = ARG(4); + offset += 5; + break; + case IDO_ACT_SET_ITEM_PIC: + getItem(ARG(2)).picture = ARG(1); + offset += 3; + break; + case IDO_ACT_RESET_PIC: + getCurRoom().curPicture = getCurRoom().picture; + ++offset; + break; + case IDO_ACT_GO_NORTH: + case IDO_ACT_GO_SOUTH: + case IDO_ACT_GO_EAST: + case IDO_ACT_GO_WEST: + case IDO_ACT_GO_UP: + case IDO_ACT_GO_DOWN: { + byte room = getCurRoom().connections[ARG(0) - IDO_ACT_GO_NORTH]; + + if (room == 0) { + printMessage(_messageIds.cantGoThere); + return; + } + + getCurRoom().curPicture = getCurRoom().picture; + _state.room = room; + return; + } + case IDO_ACT_TAKE_ITEM: + takeItem(noun); + ++offset; + break; + case IDO_ACT_DROP_ITEM: + dropItem(noun); + ++offset; + break; + case IDO_ACT_SET_ROOM_PIC: + getRoom(ARG(1)).picture = getRoom(ARG(1)).curPicture = ARG(2); + offset += 3; + break; + default: + error("Invalid action opcode %02x", ARG(0)); + } + } +} + +#undef ARG + +bool AdlEngine::doOneCommand(const Commands &commands, byte verb, byte noun) { + Commands::const_iterator cmd; + + for (cmd = commands.begin(); cmd != commands.end(); ++cmd) { + uint offset = 0; + if (matchCommand(*cmd, verb, noun, &offset)) { + doActions(*cmd, noun, offset); + return true; + } + } + + return false; +} + +void AdlEngine::doAllCommands(const Commands &commands, byte verb, byte noun) { + Commands::const_iterator cmd; + + for (cmd = commands.begin(); cmd != commands.end(); ++cmd) { + uint offset = 0; + if (matchCommand(*cmd, verb, noun, &offset)) + doActions(*cmd, noun, offset); + } +} + +} // End of namespace Adl diff --git a/engines/adl/adl.h b/engines/adl/adl.h new file mode 100644 index 0000000000..4ea7566669 --- /dev/null +++ b/engines/adl/adl.h @@ -0,0 +1,247 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef ADL_ADL_H +#define ADL_ADL_H + +#include "common/array.h" +#include "common/rect.h" +#include "common/str.h" + +#include "engines/engine.h" + +namespace Common { +class ReadStream; +class SeekableReadStream; +} + +namespace Adl { + +class Display; +struct AdlGameDescription; + +// Conditional opcodes +#define IDO_CND_ITEM_IN_ROOM 0x03 +#define IDO_CND_MOVES_GE 0x05 +#define IDO_CND_VAR_EQ 0x06 +#define IDO_CND_CUR_PIC_EQ 0x09 +#define IDO_CND_ITEM_PIC_EQ 0x0a + +// Action opcodes +#define IDO_ACT_VAR_ADD 0x01 +#define IDO_ACT_VAR_SUB 0x02 +#define IDO_ACT_VAR_SET 0x03 +#define IDO_ACT_LIST_ITEMS 0x04 +#define IDO_ACT_MOVE_ITEM 0x05 +#define IDO_ACT_SET_ROOM 0x06 +#define IDO_ACT_SET_CUR_PIC 0x07 +#define IDO_ACT_SET_PIC 0x08 +#define IDO_ACT_PRINT_MSG 0x09 +#define IDO_ACT_SET_LIGHT 0x0a +#define IDO_ACT_SET_DARK 0x0b +#define IDO_ACT_QUIT 0x0d +#define IDO_ACT_SAVE 0x0f +#define IDO_ACT_LOAD 0x10 +#define IDO_ACT_RESTART 0x11 +#define IDO_ACT_PLACE_ITEM 0x12 +#define IDO_ACT_SET_ITEM_PIC 0x13 +#define IDO_ACT_RESET_PIC 0x14 +#define IDO_ACT_GO_NORTH 0x15 +#define IDO_ACT_GO_SOUTH 0x16 +#define IDO_ACT_GO_EAST 0x17 +#define IDO_ACT_GO_WEST 0x18 +#define IDO_ACT_GO_UP 0x19 +#define IDO_ACT_GO_DOWN 0x1a +#define IDO_ACT_TAKE_ITEM 0x1b +#define IDO_ACT_DROP_ITEM 0x1c +#define IDO_ACT_SET_ROOM_PIC 0x1d + +#define IDI_WORD_SIZE 8 + +struct Room { + byte description; + byte connections[6]; + byte picture; + byte curPicture; +}; + +struct Picture { + byte block; + uint16 offset; +}; + +struct Command { + byte room; + byte verb, noun; + byte numCond, numAct; + Common::Array<byte> script; +}; + +enum { + IDI_ITEM_NOT_MOVED, + IDI_ITEM_MOVED, + IDI_ITEM_DOESNT_MOVE +}; + +#define IDI_NONE 0xfe + +struct Item { + byte noun; + byte room; + byte picture; + bool isLineArt; + Common::Point position; + int state; + byte description; + Common::Array<byte> roomPictures; +}; + +struct State { + Common::Array<Room> rooms; + Common::Array<Item> items; + Common::Array<byte> vars; + + byte room; + uint16 moves; + bool isDark; + + State() : room(1), moves(0), isDark(false) { } +}; + +typedef Common::List<Command> Commands; +typedef Common::HashMap<Common::String, uint> WordMap; + +class AdlEngine : public Engine { +public: + virtual ~AdlEngine(); + +protected: + AdlEngine(OSystem *syst, const AdlGameDescription *gd); + + Common::String readString(Common::ReadStream &stream, byte until = 0) const; + Common::String readStringAt(Common::SeekableReadStream &stream, uint offset, byte until = 0) const; + + virtual void printMessage(uint idx, bool wait = true) const; + void delay(uint32 ms) const; + + Common::String inputString(byte prompt = 0) const; + byte inputKey() const; + + void loadWords(Common::ReadStream &stream, WordMap &map) const; + void readCommands(Common::ReadStream &stream, Commands &commands); + + Display *_display; + + // Message strings in data file + Common::Array<Common::String> _messages; + // Picture data + Common::Array<Picture> _pictures; + // Dropped item screen offsets + Common::Array<Common::Point> _itemOffsets; + // Drawings consisting of horizontal and vertical lines only, but + // supporting scaling and rotation + Common::Array<Common::Array<byte> > _lineArt; + // <room, verb, noun, script> lists + Commands _roomCommands; + Commands _globalCommands; + + WordMap _verbs; + WordMap _nouns; + + struct { + Common::String enterCommand; + Common::String dontHaveIt; + Common::String gettingDark; + Common::String verbError; + Common::String nounError; + Common::String playAgain; + } _strings; + + struct { + uint cantGoThere; + uint dontUnderstand; + uint itemDoesntMove; + uint itemNotHere; + uint thanksForPlaying; + } _messageIds; + + // Game state + State _state; + +private: + virtual void runIntro() const { } + virtual void loadData() = 0; + virtual void initState() = 0; + virtual void restartGame() = 0; + virtual void drawPic(byte pic, Common::Point pos = Common::Point()) const = 0; + + // Engine + Common::Error run(); + bool hasFeature(EngineFeature f) const; + Common::Error loadGameState(int slot); + bool canLoadGameStateCurrently(); + Common::Error saveGameState(int slot, const Common::String &desc); + bool canSaveGameStateCurrently(); + + // Text output + void wordWrap(Common::String &str) const; + + // Text input + byte convertKey(uint16 ascii) const; + Common::String getLine() const; + Common::String getWord(const Common::String &line, uint &index) const; + void getInput(uint &verb, uint &noun); + + // Graphics + void showRoom() const; + void clearScreen() const; + void drawItems() const; + void drawNextPixel(Common::Point &p, byte color, byte bits, byte quadrant) const; + void drawLineArt(const Common::Array<byte> &lineArt, const Common::Point &pos, byte rotation = 0, byte scaling = 1, byte color = 0x7f) const; + + // Game state functions + const Room &getRoom(uint i) const; + Room &getRoom(uint i); + const Room &getCurRoom() const; + Room &getCurRoom(); + const Item &getItem(uint i) const; + Item &getItem(uint i); + byte getVar(uint i) const; + void setVar(uint i, byte value); + void takeItem(byte noun); + void dropItem(byte noun); + bool matchCommand(const Command &command, byte verb, byte noun, uint *actions = nullptr) const; + void doActions(const Command &command, byte noun, byte offset); + bool doOneCommand(const Commands &commands, byte verb, byte noun); + void doAllCommands(const Commands &commands, byte verb, byte noun); + + const AdlGameDescription *_gameDescription; + bool _isRestarting, _isRestoring; + byte _saveVerb, _saveNoun, _restoreVerb, _restoreNoun; + bool _canSaveNow, _canRestoreNow; +}; + +AdlEngine *HiRes1Engine__create(OSystem *syst, const AdlGameDescription *gd); + +} // End of namespace Adl + +#endif diff --git a/engines/adl/configure.engine b/engines/adl/configure.engine new file mode 100644 index 0000000000..844e2b8e6a --- /dev/null +++ b/engines/adl/configure.engine @@ -0,0 +1,3 @@ +# This file is included from the main "configure" script +# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] +add_engine adl "ADL" no diff --git a/engines/adl/detection.cpp b/engines/adl/detection.cpp new file mode 100644 index 0000000000..1a8c5025e8 --- /dev/null +++ b/engines/adl/detection.cpp @@ -0,0 +1,247 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "common/system.h" +#include "common/savefile.h" +#include "common/translation.h" + +#include "graphics/thumbnail.h" + +#include "engines/advancedDetector.h" + +#include "adl/detection.h" + +namespace Adl { + +#define GAMEOPTION_COLOR GUIO_GAMEOPTIONS1 +#define GAMEOPTION_SCANLINES GUIO_GAMEOPTIONS2 + +static const ADExtraGuiOptionsMap optionsList[] = { + { + GAMEOPTION_COLOR, + { + _s("Color mode"), + _s("Use color graphics"), + "color", + false + } + }, + + { + GAMEOPTION_SCANLINES, + { + _s("Scanlines"), + _s("Show scanlines"), + "scanlines", + false + } + }, + + AD_EXTRA_GUI_OPTIONS_TERMINATOR +}; + +static const PlainGameDescriptor adlGames[] = { + {"hires1", "Hi-Res Adventure #1: Mystery House"}, + {0, 0} +}; + +static const AdlGameDescription gameDescriptions[] = { + { // Hi-Res Adventure #1: Mystery House - Apple II - 1987 PD release + { + "hires1", 0, + { + {"ADVENTURE", 0, "22d9e63a11d69fa033ba1738715ad09a", 29952}, + {"AUTO LOAD OBJ", 0, "23bfccfe9fcff9b22cf6c41bde9078ac", 12291}, + {"MYSTERY.HELLO", 0, "2289b7fea300b506e902a4c597968369", 836}, + AD_LISTEND + }, + Common::EN_ANY, + Common::kPlatformApple2GS, // FIXME + ADGF_NO_FLAGS, + GUIO2(GAMEOPTION_COLOR, GAMEOPTION_SCANLINES) + }, + GAME_TYPE_HIRES1 + }, + { AD_TABLE_END_MARKER, GAME_TYPE_NONE } +}; + +class AdlMetaEngine : public AdvancedMetaEngine { +public: + AdlMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(AdlGameDescription), adlGames, optionsList) { } + + const char *getName() const { + return "ADL"; + } + + const char *getOriginalCopyright() const { + return "Copyright (C) Sierra On-Line"; + } + + bool hasFeature(MetaEngineFeature f) const; + SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; + int getMaximumSaveSlot() const { return 'O' - 'A'; } + SaveStateList listSaves(const char *target) const; + void removeSaveState(const char *target, int slot) const; + + bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const; +}; + +bool AdlMetaEngine::hasFeature(MetaEngineFeature f) const { + switch(f) { + case kSupportsListSaves: + case kSupportsLoadingDuringStartup: + case kSupportsDeleteSave: + case kSavesSupportMetaInfo: + case kSavesSupportThumbnail: + case kSavesSupportCreationDate: + case kSavesSupportPlayTime: + return true; + default: + return false; + } +} + +SaveStateDescriptor AdlMetaEngine::querySaveMetaInfos(const char *target, int slot) const { + Common::String fileName = Common::String::format("%s.s%02d", target, slot); + Common::InSaveFile *inFile = g_system->getSavefileManager()->openForLoading(fileName); + + if (!inFile) + return SaveStateDescriptor(); + + if (inFile->readUint32BE() != MKTAG('A', 'D', 'L', ':')) { + delete inFile; + return SaveStateDescriptor(); + } + + byte saveVersion = inFile->readByte(); + if (saveVersion != SAVEGAME_VERSION) { + delete inFile; + return SaveStateDescriptor(); + } + + char name[SAVEGAME_NAME_LEN] = { }; + inFile->read(name, sizeof(name) - 1); + inFile->readByte(); + + if (inFile->eos() || inFile->err()) { + delete inFile; + return SaveStateDescriptor(); + } + + SaveStateDescriptor sd(slot, name); + + int year = inFile->readUint16BE(); + int month = inFile->readByte(); + int day = inFile->readByte(); + sd.setSaveDate(year + 1900, month + 1, day); + + int hour = inFile->readByte(); + int minutes = inFile->readByte(); + sd.setSaveTime(hour, minutes); + + uint32 playTime = inFile->readUint32BE(); + sd.setPlayTime(playTime); + + if (inFile->eos() || inFile->err()) { + delete inFile; + return SaveStateDescriptor(); + } + + Graphics::Surface *const thumbnail = Graphics::loadThumbnail(*inFile); + sd.setThumbnail(thumbnail); + + delete inFile; + return sd; +} + +SaveStateList AdlMetaEngine::listSaves(const char *target) const { + Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); + Common::StringArray files = saveFileMan->listSavefiles(Common::String(target) + ".s##"); + + SaveStateList saveList; + + for (uint i = 0; i < files.size(); ++i) { + const Common::String &fileName = files[i]; + Common::InSaveFile *inFile = saveFileMan->openForLoading(fileName); + if (!inFile) { + warning("Cannot open save file '%s'", fileName.c_str()); + continue; + } + + if (inFile->readUint32BE() != MKTAG('A', 'D', 'L', ':')) { + warning("No header found in '%s'", fileName.c_str()); + delete inFile; + continue; + } + + byte saveVersion = inFile->readByte(); + if (saveVersion != SAVEGAME_VERSION) { + warning("Unsupported save game version %i found in '%s'", saveVersion, fileName.c_str()); + delete inFile; + continue; + } + + char name[SAVEGAME_NAME_LEN] = { }; + inFile->read(name, sizeof(name) - 1); + delete inFile; + + int slotNum = atoi(fileName.c_str() + fileName.size() - 2); + SaveStateDescriptor sd(slotNum, name); + saveList.push_back(sd); + } + + // Sort saves based on slot number. + Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator()); + return saveList; +} + +void AdlMetaEngine::removeSaveState(const char *target, int slot) const { + Common::String fileName = Common::String::format("%s.s%02d", target, slot); + g_system->getSavefileManager()->removeSavefile(fileName); +} + +Engine *HiRes1Engine_create(OSystem *syst, const AdlGameDescription *gd); + +bool AdlMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const { + if (!gd) + return false; + + const AdlGameDescription *adlGd = (const AdlGameDescription *)gd; + + switch (adlGd->gameType) { + case GAME_TYPE_HIRES1: + *engine = HiRes1Engine_create(syst, adlGd); + break; + default: + error("Unknown GameType"); + } + + return true; +} + +} // End of namespace Adl + +#if PLUGIN_ENABLED_DYNAMIC(ADL) + REGISTER_PLUGIN_DYNAMIC(ADL, PLUGIN_TYPE_ENGINE, Adl::AdlMetaEngine); +#else + REGISTER_PLUGIN_STATIC(ADL, PLUGIN_TYPE_ENGINE, Adl::AdlMetaEngine); +#endif diff --git a/engines/adl/detection.h b/engines/adl/detection.h new file mode 100644 index 0000000000..c646aeb5b9 --- /dev/null +++ b/engines/adl/detection.h @@ -0,0 +1,45 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef ADL_DETECTION_H +#define ADL_DETECTION_H + +#include "engines/advancedDetector.h" + +namespace Adl { + +#define SAVEGAME_VERSION 0 +#define SAVEGAME_NAME_LEN 32 + +enum GameType { + GAME_TYPE_NONE, + GAME_TYPE_HIRES1 +}; + +struct AdlGameDescription { + ADGameDescription desc; + GameType gameType; +}; + +} // End of namespace Adl + +#endif diff --git a/engines/adl/display.cpp b/engines/adl/display.cpp new file mode 100644 index 0000000000..6342504bc3 --- /dev/null +++ b/engines/adl/display.cpp @@ -0,0 +1,520 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "common/stream.h" +#include "common/rect.h" +#include "common/system.h" +#include "common/str.h" +#include "common/config-manager.h" + +#include "graphics/surface.h" +#include "graphics/palette.h" +#include "graphics/thumbnail.h" + +#include "engines/util.h" + +#include "adl/display.h" + +namespace Adl { + +// This implements the Apple II "Hi-Res" display mode + +#define DISPLAY_PITCH (DISPLAY_WIDTH / 7) +#define DISPLAY_SIZE (DISPLAY_PITCH * DISPLAY_HEIGHT) + +#define TEXT_WIDTH 40 +#define TEXT_HEIGHT 24 +#define TEXT_BUF_SIZE (TEXT_WIDTH * TEXT_HEIGHT) + +#define COLOR_PALETTE_ENTRIES 8 +static const byte colorPalette[COLOR_PALETTE_ENTRIES * 3] = { + 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, + 0xc7, 0x34, 0xff, + 0x38, 0xcb, 0x00, + 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, + 0x0d, 0xa1, 0xff, + 0xf2, 0x5e, 0x00 +}; + +// Corresponding color in second palette +#define PAL2(X) ((X) | 0x04) + +// Alternate color for odd pixel rows (for scanlines) +#define ALTCOL(X) ((X) | 0x08) + +// Green monochrome palette +#define MONO_PALETTE_ENTRIES 2 +static const byte monoPalette[MONO_PALETTE_ENTRIES * 3] = { + 0x00, 0x00, 0x00, + 0x00, 0xc0, 0x01 +}; + +// Uppercase-only Apple II font (manually created). +static const byte font[64][5] = { + { 0x7c, 0x82, 0xba, 0xb2, 0x9c }, { 0xf8, 0x24, 0x22, 0x24, 0xf8 }, // @A + { 0xfe, 0x92, 0x92, 0x92, 0x6c }, { 0x7c, 0x82, 0x82, 0x82, 0x44 }, // BC + { 0xfe, 0x82, 0x82, 0x82, 0x7c }, { 0xfe, 0x92, 0x92, 0x92, 0x82 }, // DE + { 0xfe, 0x12, 0x12, 0x12, 0x02 }, { 0x7c, 0x82, 0x82, 0xa2, 0xe2 }, // FG + { 0xfe, 0x10, 0x10, 0x10, 0xfe }, { 0x00, 0x82, 0xfe, 0x82, 0x00 }, // HI + { 0x40, 0x80, 0x80, 0x80, 0x7e }, { 0xfe, 0x10, 0x28, 0x44, 0x82 }, // JK + { 0xfe, 0x80, 0x80, 0x80, 0x80 }, { 0xfe, 0x04, 0x18, 0x04, 0xfe }, // LM + { 0xfe, 0x08, 0x10, 0x20, 0xfe }, { 0x7c, 0x82, 0x82, 0x82, 0x7c }, // NO + { 0xfe, 0x12, 0x12, 0x12, 0x0c }, { 0x7c, 0x82, 0xa2, 0x42, 0xbc }, // PQ + { 0xfe, 0x12, 0x32, 0x52, 0x8c }, { 0x4c, 0x92, 0x92, 0x92, 0x64 }, // RS + { 0x02, 0x02, 0xfe, 0x02, 0x02 }, { 0x7e, 0x80, 0x80, 0x80, 0x7e }, // TU + { 0x3e, 0x40, 0x80, 0x40, 0x3e }, { 0xfe, 0x40, 0x30, 0x40, 0xfe }, // VW + { 0xc6, 0x28, 0x10, 0x28, 0xc6 }, { 0x06, 0x08, 0xf0, 0x08, 0x06 }, // XY + { 0xc2, 0xa2, 0x92, 0x8a, 0x86 }, { 0xfe, 0xfe, 0x82, 0x82, 0x82 }, // Z[ + { 0x04, 0x08, 0x10, 0x20, 0x40 }, { 0x82, 0x82, 0x82, 0xfe, 0xfe }, // \] + { 0x20, 0x10, 0x08, 0x10, 0x20 }, { 0x80, 0x80, 0x80, 0x80, 0x80 }, // ^_ + { 0x00, 0x00, 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0xbe, 0x00, 0x00 }, // ! + { 0x00, 0x0e, 0x00, 0x0e, 0x00 }, { 0x28, 0xfe, 0x28, 0xfe, 0x28 }, // "# + { 0x48, 0x54, 0xfe, 0x54, 0x24 }, { 0x46, 0x26, 0x10, 0xc8, 0xc4 }, // $% + { 0x6c, 0x92, 0xac, 0x40, 0xa0 }, { 0x00, 0x00, 0x0e, 0x00, 0x00 }, // &' + { 0x38, 0x44, 0x82, 0x00, 0x00 }, { 0x00, 0x00, 0x82, 0x44, 0x38 }, // () + { 0x44, 0x28, 0xfe, 0x28, 0x44 }, { 0x10, 0x10, 0x7c, 0x10, 0x10 }, // *+ + { 0x00, 0x80, 0x60, 0x00, 0x00 }, { 0x10, 0x10, 0x10, 0x10, 0x10 }, // ,- + { 0x00, 0x00, 0x80, 0x00, 0x00 }, { 0x40, 0x20, 0x10, 0x08, 0x04 }, // ./ + { 0x7c, 0xa2, 0x92, 0x8a, 0x7c }, { 0x00, 0x84, 0xfe, 0x80, 0x00 }, // 01 + { 0xc4, 0xa2, 0x92, 0x92, 0x8c }, { 0x42, 0x82, 0x92, 0x9a, 0x66 }, // 23 + { 0x30, 0x28, 0x24, 0xfe, 0x20 }, { 0x4e, 0x8a, 0x8a, 0x8a, 0x72 }, // 45 + { 0x78, 0x94, 0x92, 0x92, 0x62 }, { 0x02, 0xe2, 0x12, 0x0a, 0x06 }, // 67 + { 0x6c, 0x92, 0x92, 0x92, 0x6c }, { 0x8c, 0x92, 0x92, 0x52, 0x3c }, // 89 + { 0x00, 0x00, 0x28, 0x00, 0x00 }, { 0x00, 0x80, 0x68, 0x00, 0x00 }, // :; + { 0x10, 0x28, 0x44, 0x82, 0x00 }, { 0x28, 0x28, 0x28, 0x28, 0x28 }, // <= + { 0x00, 0x82, 0x44, 0x28, 0x10 }, { 0x04, 0x02, 0xb2, 0x0a, 0x04 } // >? +}; + +Display::Display() : + _mode(DISPLAY_MODE_TEXT), + _cursorPos(0), + _showCursor(false) { + + initGraphics(DISPLAY_WIDTH * 2, DISPLAY_HEIGHT * 2, true); + + _monochrome = !ConfMan.getBool("color"); + _scanlines = ConfMan.getBool("scanlines"); + + if (_monochrome) + g_system->getPaletteManager()->setPalette(monoPalette, 0, MONO_PALETTE_ENTRIES); + else + g_system->getPaletteManager()->setPalette(colorPalette, 0, COLOR_PALETTE_ENTRIES); + + showScanlines(_scanlines); + + _frameBuf = new byte[DISPLAY_SIZE]; + memset(_frameBuf, 0, DISPLAY_SIZE); + _frameBufSurface = new Graphics::Surface; + // We need 2x scaling to properly render the half-pixel shift + // of the second palette + _frameBufSurface->create(DISPLAY_WIDTH * 2, DISPLAY_HEIGHT * 2, Graphics::PixelFormat::createFormatCLUT8()); + + _textBuf = new byte[TEXT_BUF_SIZE]; + memset(_textBuf, APPLECHAR(' '), TEXT_BUF_SIZE); + _textBufSurface = new Graphics::Surface; + // For ease of copying, also use 2x scaling here + _textBufSurface->create(DISPLAY_WIDTH * 2, DISPLAY_HEIGHT * 2, Graphics::PixelFormat::createFormatCLUT8()); + + createFont(); +} + +Display::~Display() { + delete[] _frameBuf; + _frameBufSurface->free(); + delete _frameBufSurface; + + delete[] _textBuf; + _textBufSurface->free(); + delete _textBufSurface; + + _font->free(); + delete _font; +} + +void Display::setMode(DisplayMode mode) { + _mode = mode; + + if (_mode == DISPLAY_MODE_TEXT || _mode == DISPLAY_MODE_MIXED) + updateTextScreen(); + if (_mode == DISPLAY_MODE_HIRES || _mode == DISPLAY_MODE_MIXED) + updateHiResScreen(); +} + +void Display::updateTextScreen() { + updateTextSurface(); + + if (_mode == DISPLAY_MODE_TEXT) + g_system->copyRectToScreen(_textBufSurface->getPixels(), _textBufSurface->pitch, 0, 0, _textBufSurface->w, _textBufSurface->h); + else if (_mode == DISPLAY_MODE_MIXED) + g_system->copyRectToScreen(_textBufSurface->getBasePtr(0, _textBufSurface->h - 4 * 8 * 2), _textBufSurface->pitch, 0, _textBufSurface->h - 4 * 8 * 2, _textBufSurface->w, 4 * 8 * 2); + + g_system->updateScreen(); +} + +void Display::updateHiResScreen() { + updateHiResSurface(); + + if (_mode == DISPLAY_MODE_HIRES) + g_system->copyRectToScreen(_frameBufSurface->getPixels(), _frameBufSurface->pitch, 0, 0, _frameBufSurface->w, _frameBufSurface->h); + else if (_mode == DISPLAY_MODE_MIXED) + g_system->copyRectToScreen(_frameBufSurface->getPixels(), _frameBufSurface->pitch, 0, 0, _frameBufSurface->w, _frameBufSurface->h - 4 * 8 * 2); + + g_system->updateScreen(); +} + +bool Display::saveThumbnail(Common::WriteStream &out) { + if (_scanlines) { + showScanlines(false); + g_system->updateScreen(); + } + + bool retval = Graphics::saveThumbnail(out); + + if (_scanlines) { + showScanlines(true); + g_system->updateScreen(); + } + + return retval; +} + +void Display::loadFrameBuffer(Common::ReadStream &stream) { + byte *dst = _frameBuf; + for (uint j = 0; j < 8; ++j) { + for (uint i = 0; i < 8; ++i) { + stream.read(dst, DISPLAY_PITCH); + dst += DISPLAY_PITCH * 64; + stream.read(dst, DISPLAY_PITCH); + dst += DISPLAY_PITCH * 64; + stream.read(dst, DISPLAY_PITCH); + stream.readUint32LE(); + stream.readUint32LE(); + dst -= DISPLAY_PITCH * 120; + } + dst -= DISPLAY_PITCH * 63; + } + + if (stream.eos() || stream.err()) + error("Failed to read frame buffer"); +} + +void Display::putPixel(const Common::Point &p, byte color) { + byte offset = p.x / 7; + + if (offset & 1) { + byte c = color << 1; + if (c >= 0x40 && c < 0xc0) + color ^= 0x7f; + } + + byte *b = _frameBuf + p.y * DISPLAY_PITCH + offset; + color ^= *b; + color &= 1 << (p.x % 7); + *b ^= color; +} + +void Display::clear(byte color) { + byte val = 0; + + byte c = color << 1; + if (c >= 0x40 && c < 0xc0) + val = 0x7f; + + for (uint i = 0; i < DISPLAY_SIZE; ++i) { + _frameBuf[i] = color; + color ^= val; + } +} + +void Display::home() { + memset(_textBuf, APPLECHAR(' '), TEXT_BUF_SIZE); + _cursorPos = 0; +} + +void Display::moveCursorForward() { + ++_cursorPos; + + if (_cursorPos >= TEXT_BUF_SIZE) + scrollUp(); +} + +void Display::moveCursorBackward() { + if (_cursorPos > 0) + --_cursorPos; +} + +void Display::moveCursorTo(const Common::Point &pos) { + _cursorPos = pos.y * TEXT_WIDTH + pos.x; + + if (_cursorPos >= TEXT_BUF_SIZE) + error("Cursor position (%i, %i) out of bounds", pos.x, pos.y); +} + +void Display::printString(const Common::String &str) { + Common::String::const_iterator c; + for (c = str.begin(); c != str.end(); ++c) { + byte b = *c; + + if (*c == APPLECHAR('\r')) + _cursorPos = (_cursorPos / TEXT_WIDTH + 1) * TEXT_WIDTH; + else if (b < 0x80 || b >= 0xa0) { + setCharAtCursor(b); + ++_cursorPos; + } + + if (_cursorPos == TEXT_BUF_SIZE) + scrollUp(); + } + + updateTextScreen(); +} + +void Display::printAsciiString(const Common::String &str) { + Common::String aStr; + + Common::String::const_iterator it; + for (it = str.begin(); it != str.end(); ++it) + aStr += APPLECHAR(*it); + + printString(aStr); +} + +void Display::setCharAtCursor(byte c) { + _textBuf[_cursorPos] = c; +} + +void Display::showCursor(bool enable) { + _showCursor = enable; +} + +void Display::showScanlines(bool enable) { + byte pal[COLOR_PALETTE_ENTRIES * 3] = { }; + + if (enable) + g_system->getPaletteManager()->setPalette(pal, COLOR_PALETTE_ENTRIES, COLOR_PALETTE_ENTRIES); + else { + g_system->getPaletteManager()->grabPalette(pal, 0, COLOR_PALETTE_ENTRIES); + g_system->getPaletteManager()->setPalette(pal, COLOR_PALETTE_ENTRIES, COLOR_PALETTE_ENTRIES); + } +} + +static byte processColorBits(uint16 &bits, bool &odd, bool secondPal) { + byte color = 0; + + switch (bits & 0x7) { + case 0x3: // 011 (white) + case 0x6: // 110 + case 0x7: // 111 + color = 1; + break; + case 0x2: // 010 (color) + color = 2 + odd; + break; + case 0x5: // 101 (color) + color = 2 + !odd; + } + + if (secondPal) + color = PAL2(color); + + odd = !odd; + bits >>= 1; + + return color; +} + +static void renderPixelRowColor(byte *dst, byte *src) { + uint16 bits = (src[0] & 0x7f) << 1; + byte pal = src[0] >> 7; + + if (pal != 0) + *dst++ = 0; + + bool odd = false; + + for (uint i = 0; i < DISPLAY_PITCH; ++i) { + if (i != DISPLAY_PITCH - 1) { + bits |= (src[i + 1] & 0x7f) << 8; + pal |= (src[i + 1] >> 7) << 1; + } + + // For the first 6 bits in the block we draw two pixels + for (uint j = 0; j < 6; ++j) { + byte color = processColorBits(bits, odd, pal & 1); + *dst++ = color; + *dst++ = color; + } + + // Last bit of the block, draw one, two or three pixels + byte color = processColorBits(bits, odd, pal & 1); + + // Draw the first pixel + *dst++ = color; + + switch (pal) { + case 0x0: + case 0x3: + // If palette stays the same, draw a second pixel + *dst++ = color; + break; + case 0x2: + // If we're moving from first to second palette, + // draw a second pixel, and a third in the second + // palette. + *dst++ = color; + *dst++ = PAL2(color); + } + + pal >>= 1; + } +} + +static void renderPixelRowMono(byte *dst, byte *src) { + byte pal = src[0] >> 7; + + if (pal != 0) + *dst++ = 0; + + for (uint i = 0; i < DISPLAY_PITCH; ++i) { + if (i != DISPLAY_PITCH - 1) + pal |= (src[i + 1] >> 7) << 1; + + for (uint j = 0; j < 6; ++j) { + bool color = src[i] & (1 << j); + *dst++ = color; + *dst++ = color; + } + + bool color = src[i] & (1 << 6); + + *dst++ = color; + + switch (pal) { + case 0x0: + case 0x3: + *dst++ = color; + break; + case 0x2: + *dst++ = color; + *dst++ = color; + } + + pal >>= 1; + } +} + +static void copyEvenSurfaceRows(Graphics::Surface &surf) { + byte *src = (byte *)surf.getPixels(); + + for (uint y = 0; y < surf.h / 2; ++y) { + byte *dst = src + surf.pitch; + for (uint x = 0; x < surf.w; ++x) + dst[x] = ALTCOL(src[x]); + src += surf.pitch * 2; + } +} + +void Display::updateHiResSurface() { + byte *src = _frameBuf; + byte *dst = (byte *)_frameBufSurface->getPixels(); + + for (uint i = 0; i < DISPLAY_HEIGHT; ++i) { + if (_monochrome) + renderPixelRowMono(dst, src); + else + renderPixelRowColor(dst, src); + src += DISPLAY_PITCH; + dst += _frameBufSurface->pitch * 2; + } + + copyEvenSurfaceRows(*_frameBufSurface); +} + +void Display::updateTextSurface() { + for (uint row = 0; row < 24; ++row) + for (uint col = 0; col < TEXT_WIDTH; ++col) { + uint charPos = row * TEXT_WIDTH + col; + char c = _textBuf[row * TEXT_WIDTH + col]; + + if (charPos == _cursorPos && _showCursor) + c = (c & 0x3f) | 0x40; + + Common::Rect r(7 * 2, 8 * 2); + r.translate(((c & 0x3f) % 16) * 7 * 2, (c & 0x3f) / 16 * 8 * 2); + + if (!(c & 0x80)) { + if (!(c & 0x40) || ((g_system->getMillis() / 270) & 1)) + r.translate(0, 4 * 8 * 2); + } + + _textBufSurface->copyRectToSurface(*_font, col * 7 * 2, row * 8 * 2, r); + } +} + +void Display::drawChar(byte c, int x, int y) { + byte *buf = (byte *)_font->getPixels() + y * _font->pitch + x; + + for (uint row = 0; row < 8; ++row) { + for (uint col = 1; col < 6; ++col) { + if (font[c][col - 1] & (1 << row)) { + buf[col * 2] = 1; + buf[col * 2 + 1] = 1; + } + } + + buf += 2 * _font->pitch; + } +} + +void Display::createFont() { + _font = new Graphics::Surface; + _font->create(16 * 7 * 2, 4 * 8 * 2 * 2, Graphics::PixelFormat::createFormatCLUT8()); + + for (uint i = 0; i < 4; ++i) + for (uint j = 0; j < 16; ++j) + drawChar(i * 16 + j, j * 7 * 2, i * 8 * 2); + + // Create inverted font + byte *buf = (byte *)_font->getPixels(); + byte *bufInv = buf + (_font->h / 2) * _font->pitch; + + for (uint row = 0; row < _font->h / 2; row += 2) { + for (uint col = 0; col < _font->w; ++col) + bufInv[col] = (buf[col] ? 0 : 1); + + buf += _font->pitch * 2; + bufInv += _font->pitch * 2; + } + + copyEvenSurfaceRows(*_font); +} + +void Display::scrollUp() { + memmove(_textBuf, _textBuf + TEXT_WIDTH, TEXT_BUF_SIZE - TEXT_WIDTH); + memset(_textBuf + TEXT_BUF_SIZE - TEXT_WIDTH, APPLECHAR(' '), TEXT_WIDTH); + if (_cursorPos >= TEXT_WIDTH) + _cursorPos -= TEXT_WIDTH; +} + +} // End of namespace Adl diff --git a/engines/adl/display.h b/engines/adl/display.h new file mode 100644 index 0000000000..ff01e3faf2 --- /dev/null +++ b/engines/adl/display.h @@ -0,0 +1,102 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef ADL_DISPLAY_H +#define ADL_DISPLAY_H + +#include <common/types.h> + +namespace Common { +class ReadStream; +class WriteStream; +class String; +struct Point; +} + +namespace Graphics { +struct Surface; +} + +namespace Adl { + +#define DISPLAY_WIDTH 280 +#define DISPLAY_HEIGHT 192 + +enum DisplayMode { + DISPLAY_MODE_HIRES, + DISPLAY_MODE_TEXT, + DISPLAY_MODE_MIXED +}; + +#define APPLECHAR(C) ((char)((C) | 0x80)) + +class Display { +public: + Display(); + ~Display(); + + void setMode(DisplayMode mode); + void updateTextScreen(); + void updateHiResScreen(); + bool saveThumbnail(Common::WriteStream &out); + + // Graphics + void loadFrameBuffer(Common::ReadStream &stream); + void putPixel(const Common::Point &p, byte color); + void clear(byte color); + + // Text + void home(); + void moveCursorTo(const Common::Point &pos); + void moveCursorForward(); + void moveCursorBackward(); + void printString(const Common::String &str); + void printAsciiString(const Common::String &str); + void setCharAtCursor(byte c); + void showCursor(bool enable); + +private: + void updateHiResSurface(); + void showScanlines(bool enable); + + void updateTextSurface(); + void drawChar(byte c, int x, int y); + void createFont(); + void scrollUp(); + + DisplayMode _mode; + + byte *_frameBuf; + Graphics::Surface *_frameBufSurface; + bool _scanlines; + bool _monochrome; + + byte *_textBuf; + Graphics::Surface *_textBufSurface; + Graphics::Surface *_font; + uint _cursorPos; + bool _showCursor; +}; + +} // End of namespace Adl + +#endif diff --git a/engines/adl/hires1.cpp b/engines/adl/hires1.cpp new file mode 100644 index 0000000000..6e1e31df9f --- /dev/null +++ b/engines/adl/hires1.cpp @@ -0,0 +1,396 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "common/system.h" +#include "common/debug.h" +#include "common/error.h" +#include "common/file.h" +#include "common/stream.h" + +#include "adl/hires1.h" +#include "adl/display.h" + +namespace Adl { + +void HiRes1Engine::runIntro() const { + Common::File file; + + if (!file.open(IDS_HR1_EXE_0)) + error("Failed to open file '" IDS_HR1_EXE_0 "'"); + + file.seek(IDI_HR1_OFS_LOGO_0); + _display->setMode(DISPLAY_MODE_HIRES); + _display->loadFrameBuffer(file); + _display->updateHiResScreen(); + delay(4000); + + if (shouldQuit()) + return; + + _display->setMode(DISPLAY_MODE_TEXT); + + Common::File basic; + if (!basic.open(IDS_HR1_LOADER)) + error("Failed to open file '" IDS_HR1_LOADER "'"); + + Common::String str; + + str = readStringAt(basic, IDI_HR1_OFS_PD_TEXT_0, '"'); + _display->printAsciiString(str + '\r'); + + str = readStringAt(basic, IDI_HR1_OFS_PD_TEXT_1, '"'); + _display->printAsciiString(str + "\r\r"); + + str = readStringAt(basic, IDI_HR1_OFS_PD_TEXT_2, '"'); + _display->printAsciiString(str + "\r\r"); + + str = readStringAt(basic, IDI_HR1_OFS_PD_TEXT_3, '"'); + _display->printAsciiString(str + '\r'); + + inputKey(); + if (g_engine->shouldQuit()) + return; + + _display->setMode(DISPLAY_MODE_MIXED); + + str = readStringAt(file, IDI_HR1_OFS_GAME_OR_HELP); + + bool instructions = false; + + while (1) { + _display->printString(str); + Common::String s = inputString(); + + if (g_engine->shouldQuit()) + break; + + if (s.empty()) + continue; + + if (s[0] == APPLECHAR('I')) { + instructions = true; + break; + } else if (s[0] == APPLECHAR('G')) { + break; + } + }; + + if (instructions) { + _display->setMode(DISPLAY_MODE_TEXT); + file.seek(IDI_HR1_OFS_INTRO_TEXT); + + const uint pages[] = { 6, 6, 4, 5, 8, 7, 0 }; + + uint page = 0; + while (pages[page] != 0) { + _display->home(); + + uint count = pages[page++]; + for (uint i = 0; i < count; ++i) { + str = readString(file); + _display->printString(str); + file.seek(3, SEEK_CUR); + } + + inputString(); + + if (g_engine->shouldQuit()) + return; + + file.seek(6, SEEK_CUR); + } + } + + _display->printAsciiString("\r"); + + file.close(); + + _display->setMode(DISPLAY_MODE_MIXED); + + if (!file.open(IDS_HR1_EXE_1)) + error("Failed to open file '" IDS_HR1_EXE_1 "'"); + + // Title screen shown during loading + file.seek(IDI_HR1_OFS_LOGO_1); + _display->loadFrameBuffer(file); + _display->updateHiResScreen(); + delay(2000); +} + +void HiRes1Engine::loadData() { + Common::File f; + + if (!f.open(IDS_HR1_MESSAGES)) + error("Failed to open file '" IDS_HR1_MESSAGES "'"); + + for (uint i = 0; i < IDI_HR1_NUM_MESSAGES; ++i) + _messages.push_back(readString(f, APPLECHAR('\r')) + APPLECHAR('\r')); + + f.close(); + + if (!f.open(IDS_HR1_EXE_1)) + error("Failed to open file '" IDS_HR1_EXE_1 "'"); + + // Some messages have overrides inside the executable + _messages[IDI_HR1_MSG_CANT_GO_THERE - 1] = readStringAt(f, IDI_HR1_OFS_STR_CANT_GO_THERE); + _messages[IDI_HR1_MSG_DONT_HAVE_IT - 1] = readStringAt(f, IDI_HR1_OFS_STR_DONT_HAVE_IT); + _messages[IDI_HR1_MSG_DONT_UNDERSTAND - 1] = readStringAt(f, IDI_HR1_OFS_STR_DONT_UNDERSTAND); + _messages[IDI_HR1_MSG_GETTING_DARK - 1] = readStringAt(f, IDI_HR1_OFS_STR_GETTING_DARK); + + // Load other strings from executable + _strings.enterCommand = readStringAt(f, IDI_HR1_OFS_STR_ENTER_COMMAND); + _strings.dontHaveIt = readStringAt(f, IDI_HR1_OFS_STR_DONT_HAVE_IT); + _strings.gettingDark = readStringAt(f, IDI_HR1_OFS_STR_GETTING_DARK); + _strings.verbError = readStringAt(f, IDI_HR1_OFS_STR_VERB_ERROR); + _strings.nounError = readStringAt(f, IDI_HR1_OFS_STR_NOUN_ERROR); + _strings.playAgain = readStringAt(f, IDI_HR1_OFS_STR_PLAY_AGAIN); + _gameStrings.pressReturn = readStringAt(f, IDI_HR1_OFS_STR_PRESS_RETURN); + + // Set message IDs + _messageIds.cantGoThere = IDI_HR1_MSG_CANT_GO_THERE; + _messageIds.dontUnderstand = IDI_HR1_MSG_DONT_UNDERSTAND; + _messageIds.itemDoesntMove = IDI_HR1_MSG_ITEM_DOESNT_MOVE; + _messageIds.itemNotHere = IDI_HR1_MSG_ITEM_NOT_HERE; + _messageIds.thanksForPlaying = IDI_HR1_MSG_THANKS_FOR_PLAYING; + + // Load picture data from executable + f.seek(IDI_HR1_OFS_PICS); + for (uint i = 0; i < IDI_HR1_NUM_PICS; ++i) { + struct Picture pic; + pic.block = f.readByte(); + pic.offset = f.readUint16LE(); + _pictures.push_back(pic); + } + + // Load commands from executable + f.seek(IDI_HR1_OFS_CMDS_1); + readCommands(f, _roomCommands); + + f.seek(IDI_HR1_OFS_CMDS_0); + readCommands(f, _globalCommands); + + // Load dropped item offsets + f.seek(IDI_HR1_OFS_ITEM_OFFSETS); + for (uint i = 0; i < IDI_HR1_NUM_ITEM_OFFSETS; ++i) { + Common::Point p; + p.x = f.readByte(); + p.y = f.readByte(); + _itemOffsets.push_back(p); + } + + // Load right-angle line art + f.seek(IDI_HR1_OFS_LINE_ART); + uint16 lineArtTotal = f.readUint16LE(); + for (uint i = 0; i < lineArtTotal; ++i) { + f.seek(IDI_HR1_OFS_LINE_ART + 2 + i * 2); + uint16 offset = f.readUint16LE(); + f.seek(IDI_HR1_OFS_LINE_ART + offset); + + Common::Array<byte> lineArt; + byte b = f.readByte(); + while (b != 0) { + lineArt.push_back(b); + b = f.readByte(); + } + _lineArt.push_back(lineArt); + } + + if (f.eos() || f.err()) + error("Failed to read game data from '" IDS_HR1_EXE_1 "'"); + + f.seek(IDI_HR1_OFS_VERBS); + loadWords(f, _verbs); + + f.seek(IDI_HR1_OFS_NOUNS); + loadWords(f, _nouns); +} + +void HiRes1Engine::initState() { + Common::File f; + + _state.room = 1; + _state.moves = 0; + _state.isDark = false; + + _state.vars.clear(); + _state.vars.resize(IDI_HR1_NUM_VARS); + + if (!f.open(IDS_HR1_EXE_1)) + error("Failed to open file '" IDS_HR1_EXE_1 "'"); + + // Load room data from executable + _state.rooms.clear(); + f.seek(IDI_HR1_OFS_ROOMS); + for (uint i = 0; i < IDI_HR1_NUM_ROOMS; ++i) { + Room room; + f.readByte(); + room.description = f.readByte(); + for (uint j = 0; j < 6; ++j) + room.connections[j] = f.readByte(); + room.picture = f.readByte(); + room.curPicture = f.readByte(); + _state.rooms.push_back(room); + } + + // Load item data from executable + _state.items.clear(); + f.seek(IDI_HR1_OFS_ITEMS); + while (f.readByte() != 0xff) { + Item item; + item.noun = f.readByte(); + item.room = f.readByte(); + item.picture = f.readByte(); + item.isLineArt = f.readByte(); + item.position.x = f.readByte(); + item.position.y = f.readByte(); + item.state = f.readByte(); + item.description = f.readByte(); + + f.readByte(); + + byte size = f.readByte(); + + for (uint i = 0; i < size; ++i) + item.roomPictures.push_back(f.readByte()); + + _state.items.push_back(item); + } +} + +void HiRes1Engine::restartGame() { + initState(); + _display->printString(_gameStrings.pressReturn); + inputString(); // Missing in the original + _display->printAsciiString("\r\r\r\r\r"); +} + +void HiRes1Engine::drawPic(byte pic, Common::Point pos) const { + Common::File f; + Common::String name = Common::String::format("BLOCK%i", _pictures[pic].block); + + if (!f.open(name)) + error("Failed to open file '%s'", name.c_str()); + + f.seek(_pictures[pic].offset); + drawPic(f, pos); +} + +void HiRes1Engine::printMessage(uint idx, bool wait) const { + // Messages with hardcoded overrides don't delay after printing. + // It's unclear if this is a bug or not. In some cases the result + // is that these strings will scroll past the four-line text window + // before the user gets a chance to read them. + // NOTE: later games seem to wait for a key when the text window + // overflows and don't use delays. It might be better to use + // that system for this game as well. + switch (idx) { + case IDI_HR1_MSG_CANT_GO_THERE: + case IDI_HR1_MSG_DONT_HAVE_IT: + case IDI_HR1_MSG_DONT_UNDERSTAND: + case IDI_HR1_MSG_GETTING_DARK: + wait = false; + } + + AdlEngine::printMessage(idx, wait); +} + +void HiRes1Engine::drawLine(const Common::Point &p1, const Common::Point &p2, byte color) const { + // This draws a four-connected line + + int16 deltaX = p2.x - p1.x; + int8 xStep = 1; + + if (deltaX < 0) { + deltaX = -deltaX; + xStep = -1; + } + + int16 deltaY = p2.y - p1.y; + int8 yStep = -1; + + if (deltaY > 0) { + deltaY = -deltaY; + yStep = 1; + } + + Common::Point p(p1); + int16 steps = deltaX - deltaY + 1; + int16 err = deltaX + deltaY; + + while (1) { + _display->putPixel(p, color); + + if (--steps == 0) + return; + + if (err < 0) { + p.y += yStep; + err += deltaX; + } else { + p.x += xStep; + err += deltaY; + } + } +} + +void HiRes1Engine::drawPic(Common::ReadStream &stream, const Common::Point &pos) const { + byte x, y; + bool bNewLine = false; + byte oldX = 0, oldY = 0; + while (1) { + x = stream.readByte(); + y = stream.readByte(); + + if (stream.err() || stream.eos()) + error("Failed to read picture"); + + if (x == 0xff && y == 0xff) + return; + + if (x == 0 && y == 0) { + bNewLine = true; + continue; + } + + x += pos.x; + y += pos.y; + + if (y > 160) + y = 160; + + if (bNewLine) { + _display->putPixel(Common::Point(x, y), 0x7f); + bNewLine = false; + } else { + drawLine(Common::Point(oldX, oldY), Common::Point(x, y), 0x7f); + } + + oldX = x; + oldY = y; + } +} + +Engine *HiRes1Engine_create(OSystem *syst, const AdlGameDescription *gd) { + return new HiRes1Engine(syst, gd); +} + +} // End of namespace Adl diff --git a/engines/adl/hires1.h b/engines/adl/hires1.h new file mode 100644 index 0000000000..25f4744d26 --- /dev/null +++ b/engines/adl/hires1.h @@ -0,0 +1,113 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef ADL_HIRES1_H +#define ADL_HIRES1_H + +#include "common/str.h" + +#include "adl/adl.h" + +namespace Common { +class ReadStream; +struct Point; +} + +namespace Adl { + +#define IDS_HR1_EXE_0 "AUTO LOAD OBJ" +#define IDS_HR1_EXE_1 "ADVENTURE" +#define IDS_HR1_LOADER "MYSTERY.HELLO" +#define IDS_HR1_MESSAGES "MESSAGES" + +#define IDI_HR1_NUM_ROOMS 41 +#define IDI_HR1_NUM_PICS 98 +#define IDI_HR1_NUM_VARS 20 +#define IDI_HR1_NUM_ITEM_OFFSETS 21 +#define IDI_HR1_NUM_MESSAGES 167 + +// Messages used outside of scripts +#define IDI_HR1_MSG_CANT_GO_THERE 137 +#define IDI_HR1_MSG_DONT_UNDERSTAND 37 +#define IDI_HR1_MSG_ITEM_DOESNT_MOVE 151 +#define IDI_HR1_MSG_ITEM_NOT_HERE 152 +#define IDI_HR1_MSG_THANKS_FOR_PLAYING 140 +#define IDI_HR1_MSG_DONT_HAVE_IT 127 +#define IDI_HR1_MSG_GETTING_DARK 7 + +#define IDI_HR1_OFS_STR_ENTER_COMMAND 0x5bbc +#define IDI_HR1_OFS_STR_VERB_ERROR 0x5b4f +#define IDI_HR1_OFS_STR_NOUN_ERROR 0x5b8e +#define IDI_HR1_OFS_STR_PLAY_AGAIN 0x5f1e +#define IDI_HR1_OFS_STR_CANT_GO_THERE 0x6c0a +#define IDI_HR1_OFS_STR_DONT_HAVE_IT 0x6c31 +#define IDI_HR1_OFS_STR_DONT_UNDERSTAND 0x6c51 +#define IDI_HR1_OFS_STR_GETTING_DARK 0x6c7c +#define IDI_HR1_OFS_STR_PRESS_RETURN 0x5f68 + +#define IDI_HR1_OFS_PD_TEXT_0 0x005d +#define IDI_HR1_OFS_PD_TEXT_1 0x012b +#define IDI_HR1_OFS_PD_TEXT_2 0x016d +#define IDI_HR1_OFS_PD_TEXT_3 0x0259 + +#define IDI_HR1_OFS_INTRO_TEXT 0x0066 +#define IDI_HR1_OFS_GAME_OR_HELP 0x000f + +#define IDI_HR1_OFS_LOGO_0 0x1003 +#define IDI_HR1_OFS_LOGO_1 0x1800 + +#define IDI_HR1_OFS_ITEMS 0x0100 +#define IDI_HR1_OFS_ROOMS 0x050a +#define IDI_HR1_OFS_PICS 0x4b00 +#define IDI_HR1_OFS_CMDS_0 0x3c00 +#define IDI_HR1_OFS_CMDS_1 0x3d00 + +#define IDI_HR1_OFS_ITEM_OFFSETS 0x68ff +#define IDI_HR1_OFS_LINE_ART 0x4f00 + +#define IDI_HR1_OFS_VERBS 0x3800 +#define IDI_HR1_OFS_NOUNS 0x0f00 + +class HiRes1Engine : public AdlEngine { +public: + HiRes1Engine(OSystem *syst, const AdlGameDescription *gd) : AdlEngine(syst, gd) { } + +private: + // AdlEngine + void runIntro() const; + void loadData(); + void initState(); + void restartGame(); + void drawPic(byte pic, Common::Point pos) const; + void printMessage(uint idx, bool wait = true) const; + + void drawLine(const Common::Point &p1, const Common::Point &p2, byte color) const; + void drawPic(Common::ReadStream &stream, const Common::Point &pos) const; + + struct { + Common::String pressReturn; + } _gameStrings; +}; + +} // End of namespace Adl + +#endif diff --git a/engines/adl/module.mk b/engines/adl/module.mk new file mode 100644 index 0000000000..6acd06f6de --- /dev/null +++ b/engines/adl/module.mk @@ -0,0 +1,18 @@ +MODULE := engines/adl + +MODULE_OBJS := \ + adl.o \ + detection.o \ + display.o \ + hires1.o + +MODULE_DIRS += \ + engines/adl + +# This module can be built as a plugin +ifeq ($(ENABLE_ADL), DYNAMIC_PLUGIN) +PLUGIN := 1 +endif + +# Include common rules +include $(srcdir)/rules.mk diff --git a/engines/agi/text.cpp b/engines/agi/text.cpp index 0cacce2421..110ba10632 100644 --- a/engines/agi/text.cpp +++ b/engines/agi/text.cpp @@ -885,6 +885,12 @@ void TextMgr::stringEdit(int16 stringMaxLen) { _inputStringRow = _textPos.row; _inputStringColumn = _textPos.column; + if (_inputCursorChar) { + // Cursor character is shown, which means we are one beyond the start of the input + // Adjust the column for predictive input dialog + _inputStringColumn--; + } + // Caller can set the input string _inputStringCursorPos = 0; while (_inputStringCursorPos < inputStringLen) { diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp index a3ab18ae54..689a72a743 100644 --- a/engines/composer/detection.cpp +++ b/engines/composer/detection.cpp @@ -253,6 +253,36 @@ static const ComposerGameDescription gameDescriptions[] = { GType_ComposerV2 }, + { // Provided by WindlePoons, "100% Kids Darby & Gregor" Pack. Bugreport #6825 + { + "darby", + 0, + { + {"book.ini", 0, "285308372f7dddff2ca5a25c9192cf5c", 2545}, + {"page99.rsc", 0, "40b4879e9ba6a34d6aa2a9d2e30c5ef7", 1286480}, + AD_LISTEND + }, + Common::DE_DEU, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + GUIO1(GUIO_NOASPECT) + }, + GType_ComposerV2 + }, + + { // Provided by Niv Baehr, Bugreport #6878 + { + "darby", + 0, + AD_ENTRY1("page99.rsc", "183463d18c050563dcdec2d9f9670515"), + Common::HE_ISR, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + GUIO1(GUIO_NOASPECT) + }, + GType_ComposerV2 + }, + { { "gregory", @@ -296,6 +326,23 @@ static const ComposerGameDescription gameDescriptions[] = { GType_ComposerV2 }, + { // Provided by WindlePoons, "100% Kids Darby & Gregor" Pack. Bugreport #6825 + { + "gregory", + 0, + { + {"book.ini", 0, "e54fc5c00de5f94e908a969e445af5d0", 2234}, + {"page99.rsc", 0, "1ae6610de621a9901bf87b874fbf331f", 388644}, + AD_LISTEND + }, + Common::DE_DEU, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + GUIO1(GUIO_NOASPECT) + }, + GType_ComposerV2 + }, + { // Provided by sev { "princess", diff --git a/engines/dreamweb/detection_tables.h b/engines/dreamweb/detection_tables.h index cb9bebb304..0a59543c51 100644 --- a/engines/dreamweb/detection_tables.h +++ b/engines/dreamweb/detection_tables.h @@ -244,6 +244,26 @@ static const DreamWebGameDescription gameDescriptions[] = { }, }, + // Czech fan-made translation + // From bug #7078 + { + { + "dreamweb", + "CD", + { + {"dreamweb.r00", 0, "3b5c87717fc40cc5a5ae19c155662ee3", 152918}, + {"dreamweb.r02", 0, "28458718167a040d7e988cf7d2298eae", 210466}, + {"dreamweb.exe", 0, "40cc15bdc8fa3a785b5fd1ecd6194119", 65440}, + AD_LISTEND + }, + Common::CZ_CZE, + Common::kPlatformDOS, + ADGF_CD, + GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE) + }, + }, + + { AD_TABLE_END_MARKER } }; diff --git a/engines/gob/detection/tables_fascin.h b/engines/gob/detection/tables_fascin.h index 7c7c9a7a2f..92272e9852 100644 --- a/engines/gob/detection/tables_fascin.h +++ b/engines/gob/detection/tables_fascin.h @@ -187,6 +187,20 @@ kFeaturesCD, "intro.stk", 0, 0 }, +{ // From bug #7069 + { + "fascination", + "", + AD_ENTRY1s("disk0.stk", "fbf73d7919e1a6752d924eccc14838d7", 190498), + ES_ESP, + kPlatformDOS, + ADGF_NO_FLAGS, + GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH) + }, + kGameTypeFascination, + kFeaturesNone, + "disk0.stk", 0, 0 +}, // -- Amiga -- diff --git a/engines/gob/detection/tables_playtoons.h b/engines/gob/detection/tables_playtoons.h index f249e3ffa6..e495db9e25 100644 --- a/engines/gob/detection/tables_playtoons.h +++ b/engines/gob/detection/tables_playtoons.h @@ -222,6 +222,24 @@ kFeatures640x480, "intro2.stk", 0, 0 }, +{ // Version 1.002. Bug #7052 + { + "playtoons2", + "", + { + {"playtoon.stk", 0, "8c98e9a11be9bb203a55e8c6e68e519b", 25574338}, + {"spirou.stk", 0, "91080dc148de1bbd6a97321c1a1facf3", 9817086}, + {0, 0, 0, 0} + }, + FR_FRA, + kPlatformDOS, + ADGF_NO_FLAGS, + GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT) + }, + kGameTypePlaytoons, + kFeatures640x480, + "intro2.stk", 0, 0 +}, { { "playtoons2", diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h index e060b307af..af58397200 100644 --- a/engines/kyra/lol.h +++ b/engines/kyra/lol.h @@ -463,6 +463,7 @@ private: const uint8 *_musicTrackMap; const uint16 *_ingameSoundIndex; + int _ingameSoundIndexSize; const uint8 *_ingameGMSoundIndex; int _ingameGMSoundIndexSize; const uint8 *_ingameMT32SoundIndex; diff --git a/engines/kyra/sound_lol.cpp b/engines/kyra/sound_lol.cpp index 8be0cb6ab9..6e7551ed0e 100644 --- a/engines/kyra/sound_lol.cpp +++ b/engines/kyra/sound_lol.cpp @@ -161,7 +161,7 @@ void LoLEngine::snd_playSoundEffect(int track, int volume) { return; _lastSfxTrack = track; - if (track == -1 || track >= _ingameSoundListSize) + if (track == -1 || track >= _ingameSoundIndexSize) return; volume &= 0xFF; @@ -216,10 +216,10 @@ bool LoLEngine::snd_processEnvironmentalSoundEffect(int soundId, int block) { for (int i = 3; i > 0; i--) { int dir = calcMonsterDirection(cbl & 0x1F, cbl >> 5, block & 0x1F, block >> 5); cbl = (cbl + blockShiftTable[dir]) & 0x3FF; - if (cbl != block) { - if (testWallFlag(cbl, 0, 1)) - _environmentSfxVol >>= 1; - } + if (cbl == block) + break; + if (testWallFlag(cbl, 0, 1)) + _environmentSfxVol >>= 1; } } diff --git a/engines/kyra/staticres_lol.cpp b/engines/kyra/staticres_lol.cpp index 9a4fc281d5..c40b4a0c7d 100644 --- a/engines/kyra/staticres_lol.cpp +++ b/engines/kyra/staticres_lol.cpp @@ -255,7 +255,7 @@ void LoLEngine::initStaticResource() { int tempSize; _pakFileList = _staticres->loadStrings(kLoLIngamePakFiles, _pakFileListSize); _charDefaults = _staticres->loadCharData(kLoLCharacterDefs, _charDefaultsSize); - _ingameSoundIndex = (const uint16 *)_staticres->loadRawData(kLoLIngameSfxIndex, tempSize); + _ingameSoundIndex = (const uint16 *)_staticres->loadRawData(kLoLIngameSfxIndex, _ingameSoundIndexSize); _musicTrackMap = _staticres->loadRawData(kLoLMusicTrackMap, tempSize); _ingameGMSoundIndex = _staticres->loadRawData(kLoLIngameGMSfxIndex, _ingameGMSoundIndexSize); _ingameMT32SoundIndex = _staticres->loadRawData(kLoLIngameMT32SfxIndex, _ingameMT32SoundIndexSize); diff --git a/engines/mohawk/POTFILES b/engines/mohawk/POTFILES index 54d9dcaa3a..036059da6a 100644 --- a/engines/mohawk/POTFILES +++ b/engines/mohawk/POTFILES @@ -1,3 +1,4 @@ +engines/mohawk/detection.cpp engines/mohawk/dialogs.cpp engines/mohawk/myst.cpp engines/mohawk/riven.cpp diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp index a64d7ff7df..7c202998eb 100644 --- a/engines/mohawk/detection.cpp +++ b/engines/mohawk/detection.cpp @@ -221,10 +221,25 @@ SaveStateList MohawkMetaEngine::listSaves(const char *target) const { // Loading games is only supported in Myst/Riven currently. #ifdef ENABLE_MYST if (strstr(target, "myst")) { - filenames = Mohawk::MystGameState::generateSaveGameList(); + filenames = g_system->getSavefileManager()->listSavefiles("myst-###.mys"); + size_t prefixLen = sizeof("myst") - 1; + + for (Common::StringArray::const_iterator filename = filenames.begin(); filename != filenames.end(); ++filename) { + // Extract the slot number from the filename + char slot[4]; + slot[0] = (*filename)[prefixLen + 1]; + slot[1] = (*filename)[prefixLen + 2]; + slot[2] = (*filename)[prefixLen + 3]; + slot[3] = '\0'; + + int slotNum = atoi(slot); + + // Read the description from the save + Common::String description = Mohawk::MystGameState::querySaveDescription(slotNum); + saveList.push_back(SaveStateDescriptor(slotNum, description)); + } - for (uint32 i = 0; i < filenames.size(); i++) - saveList.push_back(SaveStateDescriptor(i, filenames[i])); + Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator()); } else #endif if (strstr(target, "riven")) { @@ -238,11 +253,11 @@ SaveStateList MohawkMetaEngine::listSaves(const char *target) const { } void MohawkMetaEngine::removeSaveState(const char *target, int slot) const { + // Removing saved games is only supported in Myst/Riven currently. #ifdef ENABLE_MYST if (strstr(target, "myst")) { - Common::StringArray filenames = Mohawk::MystGameState::generateSaveGameList(); - Mohawk::MystGameState::deleteSave(filenames[slot]); + Mohawk::MystGameState::deleteSave(slot); } else #endif if (strstr(target, "riven")) { @@ -254,13 +269,7 @@ void MohawkMetaEngine::removeSaveState(const char *target, int slot) const { SaveStateDescriptor MohawkMetaEngine::querySaveMetaInfos(const char *target, int slot) const { #ifdef ENABLE_MYST if (strstr(target, "myst")) { - Common::StringArray filenames = Mohawk::MystGameState::generateSaveGameList(); - - if (slot >= (int) filenames.size()) { - return SaveStateDescriptor(); - } - - return Mohawk::MystGameState::querySaveMetaInfos(filenames[slot]); + return Mohawk::MystGameState::querySaveMetaInfos(slot); } else #endif { diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h index 7941a0d51a..e3eab89a34 100644 --- a/engines/mohawk/detection_tables.h +++ b/engines/mohawk/detection_tables.h @@ -40,7 +40,7 @@ static const MohawkGameDescription gameDescriptions[] = { AD_ENTRY1("MYST.DAT", "ae3258c9c90128d274aa6a790b3ad181"), Common::EN_ANY, Common::kPlatformWindows, - ADGF_UNSTABLE, + ADGF_TESTING, GUI_OPTIONS_MYST }, GType_MYST, @@ -58,7 +58,7 @@ static const MohawkGameDescription gameDescriptions[] = { AD_ENTRY1("DEMO.DAT", "c39303dd53fb5c4e7f3c23231c606cd0"), Common::EN_ANY, Common::kPlatformWindows, - ADGF_DEMO | ADGF_UNSTABLE, + ADGF_DEMO | ADGF_TESTING, GUI_OPTIONS_MYST_DEMO }, GType_MYST, @@ -76,7 +76,7 @@ static const MohawkGameDescription gameDescriptions[] = { AD_ENTRY1("MYST.DAT", "4beb3366ed3f3b9bfb6e81a14a43bdcc"), Common::DE_DEU, Common::kPlatformWindows, - ADGF_UNSTABLE, + ADGF_TESTING, GUI_OPTIONS_MYST }, GType_MYST, @@ -94,7 +94,7 @@ static const MohawkGameDescription gameDescriptions[] = { AD_ENTRY1("MYST.DAT", "e0937cca1ab125e48e30dc3cd5046ddf"), Common::DE_DEU, Common::kPlatformWindows, - ADGF_UNSTABLE, + ADGF_TESTING, GUI_OPTIONS_MYST }, GType_MYST, @@ -112,7 +112,7 @@ static const MohawkGameDescription gameDescriptions[] = { AD_ENTRY1("MYST.DAT", "f7e7d7ca69934f1351b5acd4fe4d44c2"), Common::ES_ESP, Common::kPlatformWindows, - ADGF_UNSTABLE, + ADGF_TESTING, GUI_OPTIONS_MYST }, GType_MYST, @@ -130,7 +130,7 @@ static const MohawkGameDescription gameDescriptions[] = { AD_ENTRY1("MYST.DAT", "a5795ce1751fc42525e4f9a1859181d5"), Common::IT_ITA, Common::kPlatformWindows, - ADGF_UNSTABLE, + ADGF_TESTING, GUI_OPTIONS_MYST }, GType_MYST, @@ -148,7 +148,7 @@ static const MohawkGameDescription gameDescriptions[] = { AD_ENTRY1("MYST.DAT", "032c88e3b7e8db4ca475e7b7db9a66bb"), Common::JA_JPN, Common::kPlatformWindows, - ADGF_UNSTABLE, + ADGF_TESTING, GUI_OPTIONS_MYST }, GType_MYST, @@ -166,7 +166,7 @@ static const MohawkGameDescription gameDescriptions[] = { AD_ENTRY1("MYST.DAT", "d631d42567a941c67c78f2e491f4ea58"), Common::FR_FRA, Common::kPlatformWindows, - ADGF_UNSTABLE, + ADGF_TESTING, GUI_OPTIONS_MYST }, GType_MYST, @@ -184,7 +184,7 @@ static const MohawkGameDescription gameDescriptions[] = { AD_ENTRY1("MAKING.DAT", "f6387e8f0f7b8a3e42c95294315d6a0e"), Common::EN_ANY, Common::kPlatformWindows, - ADGF_UNSTABLE, + ADGF_TESTING, GUI_OPTIONS_MYST_MAKING_OF }, GType_MAKINGOF, @@ -202,7 +202,7 @@ static const MohawkGameDescription gameDescriptions[] = { AD_ENTRY1("MAKING.DAT", "03ff62607e64419ab2b6ebf7b7bcdf63"), Common::JA_JPN, Common::kPlatformWindows, - ADGF_UNSTABLE, + ADGF_TESTING, GUI_OPTIONS_MYST_MAKING_OF }, GType_MAKINGOF, @@ -220,7 +220,7 @@ static const MohawkGameDescription gameDescriptions[] = { AD_ENTRY1("MYST.DAT", "c4cae9f143b5947262e6cb2397e1617e"), Common::EN_ANY, Common::kPlatformWindows, - ADGF_UNSTABLE, + ADGF_TESTING, GUI_OPTIONS_MYST_ME }, GType_MYST, @@ -238,7 +238,7 @@ static const MohawkGameDescription gameDescriptions[] = { AD_ENTRY1("MYST.DAT", "f88e0ace66dbca78eebdaaa1d3314ceb"), Common::DE_DEU, Common::kPlatformWindows, - ADGF_UNSTABLE, + ADGF_TESTING, GUI_OPTIONS_MYST_ME }, GType_MYST, @@ -256,7 +256,7 @@ static const MohawkGameDescription gameDescriptions[] = { AD_ENTRY1("MYST.DAT", "aea81633b2d2ae498f09072fb87263b6"), Common::FR_FRA, Common::kPlatformWindows, - ADGF_UNSTABLE, + ADGF_TESTING, GUI_OPTIONS_MYST_ME }, GType_MYST, @@ -274,7 +274,7 @@ static const MohawkGameDescription gameDescriptions[] = { AD_ENTRY1("MYST.DAT", "4a05771b60f4a69869838d01e85c9e80"), Common::PL_POL, Common::kPlatformWindows, - ADGF_UNSTABLE, + ADGF_TESTING, GUI_OPTIONS_MYST_ME }, GType_MYST, @@ -355,6 +355,23 @@ static const MohawkGameDescription gameDescriptions[] = { }, // Riven: The Sequel to Myst + // Version 1.0.0 (5CD) - Russian, Fargus + { + { + "riven", + "", + AD_ENTRY1s("a_Data.MHK", "2a840ed74fe5dc3a388bced674d379d5", 12024358), + Common::RU_RUS, + Common::kPlatformWindows, + ADGF_UNSTABLE, + GUIO1(GUIO_NOASPECT) + }, + GType_RIVEN, + 0, + 0, + }, + + // Riven: The Sequel to Myst // Version 1.1 (5CD) - Russian, Fargus { { @@ -1878,6 +1895,23 @@ static const MohawkGameDescription gameDescriptions[] = { "Living Books Player" }, + // From Matthew Winder in bug#6557 + // v1.0E, English, Windows + { + { + "arthurbday", + "", + AD_ENTRY1s("AB16B.LB", "c169be346de7b0bbfcd18761fc0a3e49", 3093), + Common::EN_ANY, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + GUIO1(GUIO_NOASPECT) + }, + GType_LIVINGBOOKSV2, + 0, + 0, + }, + // From Torsten in bug#3422652 { { @@ -2100,6 +2134,22 @@ static const MohawkGameDescription gameDescriptions[] = { 0 }, + // From Matthew Winder in bug#6557 + { + { + "lilmonster", + "", + AD_ENTRY1s("lmasf.lb", "fcb665df1713d0411a41515efb20bebc", 4136), + Common::EN_ANY, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + GUIO1(GUIO_NOASPECT) + }, + GType_LIVINGBOOKSV2, + 0, + 0 + }, + // From afholman in bug#3309308 { { @@ -2704,7 +2754,7 @@ static const MohawkGameDescription fallbackDescs[] = { AD_ENTRY1(0, 0), Common::UNK_LANG, Common::kPlatformWindows, - ADGF_UNSTABLE, + ADGF_TESTING, GUI_OPTIONS_MYST }, GType_MYST, @@ -2719,7 +2769,7 @@ static const MohawkGameDescription fallbackDescs[] = { AD_ENTRY1(0, 0), Common::UNK_LANG, Common::kPlatformWindows, - ADGF_UNSTABLE, + ADGF_TESTING, GUI_OPTIONS_MYST_MAKING_OF }, GType_MAKINGOF, @@ -2734,7 +2784,7 @@ static const MohawkGameDescription fallbackDescs[] = { AD_ENTRY1(0, 0), Common::UNK_LANG, Common::kPlatformWindows, - ADGF_UNSTABLE, + ADGF_TESTING, GUI_OPTIONS_MYST_ME }, GType_MYST, diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index c16fab9131..e2bc88ebf6 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -231,11 +231,9 @@ Common::Error MohawkEngine_Myst::run() { // Load game from launcher/command line if requested if (ConfMan.hasKey("save_slot") && hasGameSaveSupport()) { - uint32 gameToLoad = ConfMan.getInt("save_slot"); - Common::StringArray savedGamesList = MystGameState::generateSaveGameList(); - if (gameToLoad > savedGamesList.size()) - error ("Could not find saved game"); - _gameState->load(savedGamesList[gameToLoad]); + int saveSlot = ConfMan.getInt("save_slot"); + if (!_gameState->load(saveSlot)) + error("Failed to load save game from slot %i", saveSlot); } else { // Start us on the first stack. if (getGameType() == GType_MAKINGOF) @@ -1083,19 +1081,14 @@ void MohawkEngine_Myst::loadResources() { } Common::Error MohawkEngine_Myst::loadGameState(int slot) { - if (_gameState->load(MystGameState::generateSaveGameList()[slot])) + if (_gameState->load(slot)) return Common::kNoError; return Common::kUnknownError; } Common::Error MohawkEngine_Myst::saveGameState(int slot, const Common::String &desc) { - Common::StringArray saveList = MystGameState::generateSaveGameList(); - - if ((uint)slot < saveList.size()) - MystGameState::deleteSave(saveList[slot]); - - return _gameState->save(desc) ? Common::kNoError : Common::kUnknownError; + return _gameState->save(slot, desc) ? Common::kNoError : Common::kUnknownError; } bool MohawkEngine_Myst::hasGameSaveSupport() const { diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp index 04e7c5a9b7..6ad7dd088b 100644 --- a/engines/mohawk/myst_scripts.cpp +++ b/engines/mohawk/myst_scripts.cpp @@ -685,9 +685,14 @@ void MystScriptParser::o_changeBackgroundSound(uint16 op, uint16 var, uint16 arg // Used on Channelwood Card 3225 with argc = 8 i.e. Conditional Sound List debugC(kDebugScript, "Opcode %d: Process Sound Block", op); - Common::MemoryReadStream stream = Common::MemoryReadStream((const byte *) argv, argc * sizeof(uint16)); + Common::MemoryWriteStreamDynamic writeStream = Common::MemoryWriteStreamDynamic(DisposeAfterUse::YES); + for (uint i = 0; i < argc; i++) { + writeStream.writeUint16LE(argv[i]); + } + + Common::MemoryReadStream readStream = Common::MemoryReadStream(writeStream.getData(), writeStream.size()); - MystSoundBlock soundBlock = _vm->readSoundBlock(&stream); + MystSoundBlock soundBlock = _vm->readSoundBlock(&readStream); _vm->applySoundBlock(soundBlock); } diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp index 9d23d2fb10..4dc392a7e9 100644 --- a/engines/mohawk/myst_stacks/myst.cpp +++ b/engines/mohawk/myst_stacks/myst.cpp @@ -3089,6 +3089,8 @@ void Myst::clockReset() { } void Myst::clockResetWeight() { + _vm->_sound->replaceSoundMyst(9113); + _clockWeightVideo = _vm->_video->playMovie(_vm->wrapMovieFilename("cl1wlfch", kMystStack)); if (!_clockWeightVideo) error("Failed to open cl1wlfch movie"); diff --git a/engines/mohawk/myst_state.cpp b/engines/mohawk/myst_state.cpp index 06cd69b23c..4324d6bde5 100644 --- a/engines/mohawk/myst_state.cpp +++ b/engines/mohawk/myst_state.cpp @@ -106,16 +106,12 @@ MystGameState::MystGameState(MohawkEngine_Myst *vm, Common::SaveFileManager *sav MystGameState::~MystGameState() { } -Common::StringArray MystGameState::generateSaveGameList() { - return g_system->getSavefileManager()->listSavefiles("*.mys"); -} - -bool MystGameState::load(const Common::String &filename) { - if (!loadState(filename)) { +bool MystGameState::load(int slot) { + if (!loadState(slot)) { return false; } - loadMetadata(filename); + loadMetadata(slot); // Set Channelwood elevator state to down, because we start on the lower level _channelwood.elevatorState = 0; @@ -136,7 +132,8 @@ bool MystGameState::load(const Common::String &filename) { return true; } -bool MystGameState::loadState(const Common::String &filename) { +bool MystGameState::loadState(int slot) { + Common::String filename = buildSaveFilename(slot); Common::InSaveFile *loadFile = _saveFileMan->openForLoading(filename); if (!loadFile) { return false; @@ -160,9 +157,10 @@ bool MystGameState::loadState(const Common::String &filename) { return true; } -void MystGameState::loadMetadata(const Common::String &filename) { +void MystGameState::loadMetadata(int slot) { // Open the metadata file - Common::InSaveFile *metadataFile = openMetadataFile(filename); + Common::String filename = buildMetadataFilename(slot); + Common::InSaveFile *metadataFile = _vm->getSaveFileManager()->openForLoading(filename); if (!metadataFile) { return; } @@ -179,25 +177,19 @@ void MystGameState::loadMetadata(const Common::String &filename) { delete metadataFile; } -bool MystGameState::save(const Common::String &filename) { - // Make sure the description does not have an extension - Common::String desc = filename; - if (filename.hasSuffix(".mys") || filename.hasSuffix(".MYS")) { - desc = removeExtension(filename); - } - - if (!saveState(desc)) { +bool MystGameState::save(int slot, const Common::String &desc) { + if (!saveState(slot)) { return false; } updateMetadateForSaving(desc); - return saveMetadata(desc); + return saveMetadata(slot); } -bool MystGameState::saveState(const Common::String &desc) { +bool MystGameState::saveState(int slot) { // Make sure we have the right extension - Common::String filename = desc + ".mys"; + Common::String filename = buildSaveFilename(slot); Common::OutSaveFile *saveFile = _saveFileMan->openForSaving(filename); if (!saveFile) { return false; @@ -213,6 +205,14 @@ bool MystGameState::saveState(const Common::String &desc) { return true; } +Common::String MystGameState::buildSaveFilename(int slot) { + return Common::String::format("myst-%03d.mys", slot); +} + +Common::String MystGameState::buildMetadataFilename(int slot) { + return Common::String::format("myst-%03d.mym", slot); +} + void MystGameState::updateMetadateForSaving(const Common::String &desc) { // Update save creation info TimeDate t; @@ -226,10 +226,10 @@ void MystGameState::updateMetadateForSaving(const Common::String &desc) { _metadata.totalPlayTime = _vm->getTotalPlayTime(); } -bool MystGameState::saveMetadata(const Common::String &desc) { +bool MystGameState::saveMetadata(int slot) { // Write the metadata to a separate file so that the save files // are still compatible with the original engine - Common::String metadataFilename = desc + ".mym"; + Common::String metadataFilename = buildMetadataFilename(slot); Common::OutSaveFile *metadataFile = _saveFileMan->openForSaving(metadataFilename); if (!metadataFile) { return false; @@ -248,14 +248,12 @@ bool MystGameState::saveMetadata(const Common::String &desc) { return true; } -SaveStateDescriptor MystGameState::querySaveMetaInfos(const Common::String filename) { - SaveStateDescriptor desc; - desc.setDescription(filename); - +SaveStateDescriptor MystGameState::querySaveMetaInfos(int slot) { // Open the metadata file - Common::InSaveFile *metadataFile = openMetadataFile(filename); + Common::String filename = buildMetadataFilename(slot); + Common::InSaveFile *metadataFile = g_system->getSavefileManager()->openForLoading(filename); if (!metadataFile) { - return desc; + return SaveStateDescriptor(); } Common::Serializer m(metadataFile, nullptr); @@ -264,10 +262,11 @@ SaveStateDescriptor MystGameState::querySaveMetaInfos(const Common::String filen Mohawk::MystSaveMetadata metadata; if (!metadata.sync(m)) { delete metadataFile; - return desc; + return SaveStateDescriptor(); } // Set the save description + SaveStateDescriptor desc; desc.setDescription(metadata.saveDescription); desc.setSaveDate(metadata.saveYear, metadata.saveMonth, metadata.saveDay); desc.setSaveTime(metadata.saveHour, metadata.saveMinute); @@ -279,20 +278,26 @@ SaveStateDescriptor MystGameState::querySaveMetaInfos(const Common::String filen return desc; } -Common::InSaveFile *MystGameState::openMetadataFile(const Common::String &filename) { - // Remove the extension - Common::String baseName = removeExtension(filename); - +Common::String MystGameState::querySaveDescription(int slot) { // Open the metadata file - return g_system->getSavefileManager()->openForLoading(baseName + ".mym"); -} + Common::String filename = buildMetadataFilename(slot); + Common::InSaveFile *metadataFile = g_system->getSavefileManager()->openForLoading(filename); + if (!metadataFile) { + return ""; + } + + Common::Serializer m(metadataFile, nullptr); -Common::String MystGameState::removeExtension(const Common::String &filename) { - Common::String baseName = filename; - for (uint i = 0; i < 4; i++) { - baseName.deleteLastChar(); + // Read the metadata file + Mohawk::MystSaveMetadata metadata; + if (!metadata.sync(m)) { + delete metadataFile; + return ""; } - return baseName; + + delete metadataFile; + + return metadata.saveDescription; } void MystGameState::syncGameState(Common::Serializer &s, bool isME) { @@ -471,12 +476,14 @@ void MystGameState::syncGameState(Common::Serializer &s, bool isME) { warning("Unexpected File Position 0x%03X At End of Save/Load", s.bytesSynced()); } -void MystGameState::deleteSave(const Common::String &saveName) { - debugC(kDebugSaveLoad, "Deleting save file \'%s\'", saveName.c_str()); - Common::String basename = removeExtension(saveName); +void MystGameState::deleteSave(int slot) { + Common::String filename = buildSaveFilename(slot); + Common::String metadataFilename = buildMetadataFilename(slot); + + debugC(kDebugSaveLoad, "Deleting save file \'%s\'", filename.c_str()); - g_system->getSavefileManager()->removeSavefile(saveName); - g_system->getSavefileManager()->removeSavefile(basename + ".mym"); + g_system->getSavefileManager()->removeSavefile(filename); + g_system->getSavefileManager()->removeSavefile(metadataFilename); } void MystGameState::addZipDest(uint16 stack, uint16 view) { diff --git a/engines/mohawk/myst_state.h b/engines/mohawk/myst_state.h index 50359a5b52..7d5f3f7102 100644 --- a/engines/mohawk/myst_state.h +++ b/engines/mohawk/myst_state.h @@ -58,12 +58,12 @@ public: MystGameState(MohawkEngine_Myst*, Common::SaveFileManager*); ~MystGameState(); - static Common::StringArray generateSaveGameList(); - static SaveStateDescriptor querySaveMetaInfos(const Common::String filename); + static SaveStateDescriptor querySaveMetaInfos(int slot); + static Common::String querySaveDescription(int slot); - bool load(const Common::String &filename); - bool save(const Common::String &filename); - static void deleteSave(const Common::String &saveName); + bool load(int slot); + bool save(int slot, const Common::String &desc); + static void deleteSave(int slot); void addZipDest(uint16 stack, uint16 view); bool isReachableZipDest(uint16 stack, uint16 view); @@ -292,13 +292,13 @@ public: private: void syncGameState(Common::Serializer &s, bool isME); - static Common::InSaveFile *openMetadataFile(const Common::String &filename); - bool loadState(const Common::String &filename); - void loadMetadata(const Common::String &filename); - bool saveState(const Common::String &desc); + static Common::String buildSaveFilename(int slot); + static Common::String buildMetadataFilename(int slot); + bool loadState(int slot); + void loadMetadata(int slot); + bool saveState(int slot); void updateMetadateForSaving(const Common::String &desc); - bool saveMetadata(const Common::String &desc); - static Common::String removeExtension(const Common::String &filename); + bool saveMetadata(int slot); // The values in these regions are lists of VIEW resources // which correspond to visited zip destinations diff --git a/engines/queen/detection.cpp b/engines/queen/detection.cpp index 81e0767836..aed8b7dcb1 100644 --- a/engines/queen/detection.cpp +++ b/engines/queen/detection.cpp @@ -105,6 +105,19 @@ static const QueenGameDescription gameDescriptions[] = { }, }, + // DOS Demo - English (from Bugreport #6946) + { + { + "queen", + "Demo Alt", + AD_ENTRY1s("queen.1", "2871fc6f8090f37fa1a0c556a1c97460", 3735447), + Common::EN_ANY, + Common::kPlatformDOS, + ADGF_DEMO, + GUIO1(GUIO_NOSPEECH) + }, + }, + // DOS Interview Demo - English { { @@ -131,20 +144,18 @@ static const QueenGameDescription gameDescriptions[] = { }, }, -#if 0 // Amiga Floppy - English { { "queen", "Floppy", - AD_ENTRY1s("queen.1", NULL, 351775), // TODO: Fill in correct MD5 + AD_ENTRY1s("queen.1", "9c209c2cbc1730e3138663c4fd29c2e8", 351775), Common::EN_ANY, Common::kPlatformAmiga, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, }, -#endif // DOS Floppy - English { @@ -198,6 +209,19 @@ static const QueenGameDescription gameDescriptions[] = { }, }, + // DOS Floppy - Russian (From Bugreport #6946) + { + { + "queen", + "Floppy", + AD_ENTRY1s("queen.1", "f5e827645d3c887be3bdf4729d847756", 22677657), + Common::RU_RUS, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GUIO_NOSPEECH) + }, + }, + // DOS CD - French { { @@ -211,35 +235,31 @@ static const QueenGameDescription gameDescriptions[] = { }, }, -#if 0 // DOS Floppy - German { { "queen", "Floppy", - AD_ENTRY1s("queen.1", NULL, 22240013), // TODO: Fill in correct MD5 + AD_ENTRY1s("queen.1", "f5e827645d3c887be3bdf4729d847756", 22240013), Common::DE_DEU, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, }, -#endif -#if 0 // DOS CD - German { { "queen", "Talkie", - AD_ENTRY1s("queen.1", NULL, 217648975), // TODO: Fill in correct MD5 + AD_ENTRY1s("queen.1", "551d595be8af890fc4cb8533c9c5f5f1", 217648975), Common::DE_DEU, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GAMEOPTION_ALT_INTRO) }, }, -#endif #if 0 // DOS CD - Hebrew @@ -256,20 +276,18 @@ static const QueenGameDescription gameDescriptions[] = { }, #endif -#if 0 // DOS Floppy - Italian { { "queen", "Floppy", - AD_ENTRY1s("queen.1", NULL, 22461366), // TODO: Fill in correct MD5 + AD_ENTRY1s("queen.1", "f5e827645d3c887be3bdf4729d847756", 22461366), Common::IT_ITA, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, }, -#endif // DOS CD - Italian { @@ -284,20 +302,18 @@ static const QueenGameDescription gameDescriptions[] = { }, }, -#if 0 // DOS CD - Spanish { { "queen", "Talkie", - AD_ENTRY1s("queen.1", NULL, 190730602), // TODO: Fill in correct MD5 + AD_ENTRY1s("queen.1", "b6302bccf70463de3d5faf0f0628f742", 190730602), Common::ES_ESP, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GAMEOPTION_ALT_INTRO) }, }, -#endif // DOS CD - English (Compressed Freeware Release v1.0) { @@ -377,6 +393,19 @@ static const QueenGameDescription gameDescriptions[] = { }, }, + // DOS CD - Hungarian (Compressed Freeware Release v1.02) + { + { + "queen", + "Talkie", + AD_ENTRY1s("queen.1c", "21fd690b372f8a6289f6f33bc986276c", 51329031), + Common::HU_HUN, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GAMEOPTION_ALT_INTRO) + }, + }, + // TODO: Freeware Release for Spanish DOS CD is missing. #if 0 // DOS CD - Spanish (Compressed Freeware Release v1.0) diff --git a/engines/saga/detection_tables.h b/engines/saga/detection_tables.h index 8b3a0e5207..71225ceb2f 100644 --- a/engines/saga/detection_tables.h +++ b/engines/saga/detection_tables.h @@ -733,6 +733,36 @@ static const SAGAGameDescription gameDescriptions[] = { GUIO1(GUIO_NOASPECT) }, GID_IHNM, + GF_IHNM_COLOR_FIX, + IHNM_DEFAULT_SCENE, + &IHNM_Resources, + ARRAYSIZE(IHNMCD_GameFonts), + IHNMCD_GameFonts, + NULL, + }, + + // I Have No Mouth And I Must Scream - German fan CD translation + // English CD version with German text patch (with Nimdok) + // (English speech - German text) + { + { + "ihnm", + "fan-made", + { + {"musicfm.res", GAME_MUSICFILE_FM, "0439083e3dfdc51b486071d45872ae52", 302676}, + {"musicgm.res", GAME_MUSICFILE_GM, "80f875a1fb384160d1f4b27166eef583", 314020}, + {"scream.res", GAME_RESOURCEFILE, "46bbdc65d164ba7e89836a0935eec8e6", 79219797}, + {"scripts.res", GAME_SCRIPTFILE, "be38bbc5a26be809dbf39f13befebd01", 523800}, + {"patch.re_", GAME_PATCHFILE | GAME_RESOURCEFILE, "58b79e61594779513c7f2d35509fa89e", 5038599}, + {"sfx.res", GAME_SOUNDFILE, "1c610d543f32ec8b525e3f652536f269", 22561056}, + { NULL, 0, NULL, 0} + }, + Common::DE_DEU, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GUIO_NOASPECT) + }, + GID_IHNM, 0, IHNM_DEFAULT_SCENE, &IHNM_Resources, @@ -761,7 +791,7 @@ static const SAGAGameDescription gameDescriptions[] = { GUIO1(GUIO_NOASPECT) }, GID_IHNM, - 0, + GF_IHNM_COLOR_FIX, IHNM_DEFAULT_SCENE, &IHNM_Resources, ARRAYSIZE(IHNMCD_GameFonts), @@ -790,7 +820,7 @@ static const SAGAGameDescription gameDescriptions[] = { GUIO1(GUIO_NOASPECT) }, GID_IHNM, - 0, + GF_IHNM_COLOR_FIX, IHNM_DEFAULT_SCENE, &IHNM_Resources, ARRAYSIZE(IHNMCD_GameFonts), diff --git a/engines/saga/displayinfo.h b/engines/saga/displayinfo.h index a0cdf5733b..67448936ce 100644 --- a/engines/saga/displayinfo.h +++ b/engines/saga/displayinfo.h @@ -177,11 +177,11 @@ static PanelButton ITE_OptionPanelButtons[] = { {kPanelButtonOption, 241,98, 57,17, kTextSave,'s',0, 0,0,0}, //save {kPanelButtonOptionSaveFiles, 166,20, 112,74, 0,'-',0, 0,0,0}, //savefiles - {kPanelButtonOptionText,106,4, 0,0, kTextGameOptions,'-',0, 0,0,0}, // text: game options - {kPanelButtonOptionText,11,22, 0,0, kTextReadingSpeed,'-',0, 0,0,0}, // text: read speed - {kPanelButtonOptionText,28,22, 0,0, kTextShowDialog,'-',0, 0,0,0}, // text: read speed - {kPanelButtonOptionText,73,41, 0,0, kTextMusic,'-',0, 0,0,0}, // text: music - {kPanelButtonOptionText,69,60, 0,0, kTextSound,'-',0, 0,0,0}, // text: noise + {kPanelButtonOptionText,-1,4, 0,0, kTextGameOptions,'-',0, 0,0,0}, // text: game options + {kPanelButtonOptionText,5,18, 109,17, kTextReadingSpeed,'-',0, 0,0,0}, // text: read speed + {kPanelButtonOptionText,5,18, 109,17, kTextShowDialog,'-',0, 0,0,0}, // text: read speed + {kPanelButtonOptionText,5,37, 109,17, kTextMusic,'-',0, 0,0,0}, // text: music + {kPanelButtonOptionText,5,56, 109,17, kTextSound,'-',0, 0,0,0}, // text: noise }; static PanelButton ITE_QuitPanelButtons[] = { @@ -326,10 +326,10 @@ static PanelButton IHNM_ConversePanelButtons[] = { static PanelButton IHNM_OptionPanelButtons[] = { {kPanelButtonOptionSlider, 421,16, 16,138, 0,'-',0, 0,0,0}, //slider-scroller - {kPanelButtonOptionText,28,36, 0,0, kTextReadingSpeed,'-',0, 0,0,0}, // text: read speed - {kPanelButtonOptionText,60,61, 0,0, kTextMusic,'-',0, 0,0,0}, // text: music - {kPanelButtonOptionText,60,86, 0,0, kTextSound,'-',0, 0,0,0}, // text: noise - {kPanelButtonOptionText,56,111, 0,0, kTextVoices,'-',0, 0,0,0}, // text: voices + {kPanelButtonOptionText,11,30, 139,21, kTextReadingSpeed,'-',0, 0,0,0}, // text: read speed + {kPanelButtonOptionText,11,55, 139,21, kTextMusic,'-',0, 0,0,0}, // text: music + {kPanelButtonOptionText,11,80, 139,21, kTextSound,'-',0, 0,0,0}, // text: noise + {kPanelButtonOptionText,11,105, 139,21, kTextVoices,'-',0, 0,0,0}, // text: voices {kPanelButtonOption, 154,30, 79,23, kTextReadingSpeed,'r',0, 0,0,0}, //read speed {kPanelButtonOption, 154,55, 79,23, kTextMusic,'m',0, 0,0,0}, //music {kPanelButtonOption, 154,80, 79,23, kTextSound,'n',0, 0,0,0}, //sound-noise diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp index ad940aaf8b..cb09d53762 100644 --- a/engines/saga/interface.cpp +++ b/engines/saga/interface.cpp @@ -867,7 +867,7 @@ void Interface::calcOptionSaveSlider() { void Interface::drawPanelText(InterfacePanel *panel, PanelButton *panelButton) { const char *text; - int textWidth; + int textWidth, textHeight; Rect rect; Point textPoint; KnownColor textShadowKnownColor = kKnownColorVerbTextShadow; @@ -900,12 +900,26 @@ void Interface::drawPanelText(InterfacePanel *panel, PanelButton *panelButton) { } panel->calcPanelButtonRect(panelButton, rect); + if (_vm->getGameId() == GID_ITE) { + textWidth = _vm->_font->getStringWidth(kKnownFontMedium, text, 0, kFontNormal); + textHeight = _vm->_font->getHeight(kKnownFontMedium); + } else { + textWidth = _vm->_font->getStringWidth(kKnownFontVerb, text, 0, kFontNormal); + textHeight = _vm->_font->getHeight(kKnownFontVerb); + } if (panelButton->xOffset < 0) { - if (_vm->getGameId() == GID_ITE) - textWidth = _vm->_font->getStringWidth(kKnownFontMedium, text, 0, kFontNormal); - else - textWidth = _vm->_font->getStringWidth(kKnownFontVerb, text, 0, kFontNormal); + // Special case: Centered to dialog. This is used for things like the + // title of a dialog. rect.left += 2 + (panel->imageWidth - 1 - textWidth) / 2; + } else { + // The standard case is used for the things that look a bit like buttons + // but are not clickable, e.g. texts like "Music", "Sound", etc. + if (_vm->getGameId() == GID_ITE) { + rect.left = rect.right - textWidth - 3; + } else { + rect.left = (rect.right + rect.left - textWidth) / 2; + } + rect.top = (rect.top + rect.bottom - textHeight) / 2; } textPoint.x = rect.left; @@ -1865,7 +1879,7 @@ void Interface::drawStatusBar() { // Fixes bug #1848016 - "IHNM: Wrong Subtitles Color (Spanish)". This // also applies to the German and French versions (bug #7064 - "IHNM: // text mistake in german version"). - int offset = (_vm->getLanguage() == Common::ES_ESP || _vm->getLanguage() == Common::DE_DEU || _vm->getLanguage() == Common::FR_FRA) ? 1 : 0; + int offset = (_vm->getFeatures() & GF_IHNM_COLOR_FIX) ? 1 : 0; // Disable the status text in IHNM when the chapter is 8 if (_vm->getGameId() == GID_IHNM && _vm->_scene->currentChapterNumber() == 8) diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp index 77a21e7f93..649888e7ea 100644 --- a/engines/saga/saga.cpp +++ b/engines/saga/saga.cpp @@ -582,7 +582,7 @@ ColorId SagaEngine::KnownColor2ColorId(KnownColor knownColor) { // Fixes bug #1848016 - "IHNM: Wrong Subtitles Color (Spanish)". This // also applies to the German and French versions (bug #7064 - "IHNM: // text mistake in german version"). - int offset = (getLanguage() == Common::ES_ESP || getLanguage() == Common::DE_DEU || getLanguage() == Common::FR_FRA) ? 1 : 0; + int offset = (getFeatures() & GF_IHNM_COLOR_FIX) ? 1 : 0; switch (knownColor) { case(kKnownColorTransparent): diff --git a/engines/saga/saga.h b/engines/saga/saga.h index 9c7b2f5295..06cb411e5a 100644 --- a/engines/saga/saga.h +++ b/engines/saga/saga.h @@ -139,7 +139,8 @@ enum GameFeatures { GF_ITE_FLOPPY = 1 << 0, GF_ITE_DOS_DEMO = 1 << 1, GF_EXTRA_ITE_CREDITS = 1 << 2, - GF_8BIT_UNSIGNED_PCM = 1 << 3 + GF_8BIT_UNSIGNED_PCM = 1 << 3, + GF_IHNM_COLOR_FIX = 1 << 4 }; enum VerbTypeIds { diff --git a/engines/scumm/POTFILES b/engines/scumm/POTFILES index 246f14d3f0..039aa16755 100644 --- a/engines/scumm/POTFILES +++ b/engines/scumm/POTFILES @@ -1,3 +1,4 @@ +engines/scumm/detection.cpp engines/scumm/dialogs.cpp engines/scumm/help.cpp engines/scumm/input.cpp diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index 9264a6443b..0867b20fc3 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -29,6 +29,7 @@ #include "common/md5.h" #include "common/savefile.h" #include "common/system.h" +#include "common/translation.h" #include "audio/mididrv.h" @@ -957,6 +958,7 @@ public: virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; + virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const; }; bool ScummMetaEngine::hasFeature(MetaEngineFeature f) const { @@ -1329,6 +1331,21 @@ SaveStateDescriptor ScummMetaEngine::querySaveMetaInfos(const char *target, int return desc; } +static const ExtraGuiOption comiObjectLabelsOption = { + _s("Show Object Line"), + _s("Show the names of objects at the bottom of the screen"), + "object_labels", + true +}; + +const ExtraGuiOptions ScummMetaEngine::getExtraGuiOptions(const Common::String &target) const { + ExtraGuiOptions options; + if (target.empty() || ConfMan.get("gameid", target) == "comi") { + options.push_back(comiObjectLabelsOption); + } + return options; +} + #if PLUGIN_ENABLED_DYNAMIC(SCUMM) REGISTER_PLUGIN_DYNAMIC(SCUMM, PLUGIN_TYPE_ENGINE, ScummMetaEngine); #else diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h index 41c59cb521..e986ae4b47 100644 --- a/engines/scumm/scumm-md5.h +++ b/engines/scumm/scumm-md5.h @@ -1,5 +1,5 @@ /* - This file was generated by the md5table tool on Tue Jan 12 23:47:54 2016 + This file was generated by the md5table tool on Mon Mar 28 09:52:54 2016 DO NOT EDIT MANUALLY! */ @@ -189,6 +189,7 @@ static const MD5Table md5table[] = { { "3b832f4a90740bf22e9b8ed42ca0128c", "freddi4", "HE 99", "", -1, Common::EN_GRB, Common::kPlatformUnknown }, { "3c4c471342bd95505a42334367d8f127", "puttmoon", "HE 70", "", 12161, Common::RU_RUS, Common::kPlatformWindows }, { "3cce1913a3bc586b51a75c3892ff18dd", "indy3", "VGA", "VGA", -1, Common::RU_RUS, Common::kPlatformDOS }, + { "3cf4b6ff78f735b671d8ccc2bc110b15", "maniac", "V2", "V2", -1, Common::ES_ESP, Common::kPlatformAmiga }, { "3d219e7546039543307b55a91282bf18", "funpack", "", "", -1, Common::EN_ANY, Common::kPlatformDOS }, { "3de99ef0523f8ca7958faa3afccd035a", "spyfox", "HE 100", "Updated", -1, Common::EN_USA, Common::kPlatformUnknown }, { "3df6ead57930488bc61e6e41901d0e97", "fbear", "HE 62", "", -1, Common::EN_ANY, Common::kPlatformMacintosh }, diff --git a/engines/sherlock/tattoo/widget_inventory.cpp b/engines/sherlock/tattoo/widget_inventory.cpp index 34331f0eae..9f126cf7a7 100644 --- a/engines/sherlock/tattoo/widget_inventory.cpp +++ b/engines/sherlock/tattoo/widget_inventory.cpp @@ -546,7 +546,7 @@ void WidgetInventory::drawBars() { _surface.SHtransBlitFrom(images[7], Common::Point(x - 1, INVENTORY_YSIZE + 2)); } - _surface.hLine(x + 2, INVENTORY_YSIZE + 2, INVENTORY_YSIZE + 8, INFO_BOTTOM); + _surface.vLine(x + 2, INVENTORY_YSIZE + 2, INVENTORY_YSIZE + 8, INFO_BOTTOM); } void WidgetInventory::drawInventory() { diff --git a/engines/wage/detection.cpp b/engines/wage/detection.cpp index 512d432e54..1b418b5aa8 100644 --- a/engines/wage/detection.cpp +++ b/engines/wage/detection.cpp @@ -54,6 +54,7 @@ static const PlainGameDescriptor wageGames[] = { class WageMetaEngine : public AdvancedMetaEngine { public: WageMetaEngine() : AdvancedMetaEngine(Wage::gameDescriptions, sizeof(ADGameDescription), wageGames) { + _md5Bytes = 50000; _singleId = "wage"; _guiOptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI); } diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h index 1a177c2bb0..096338659b 100644 --- a/engines/wage/detection_tables.h +++ b/engines/wage/detection_tables.h @@ -32,108 +32,148 @@ namespace Wage { #define BIGGAME(t,v,f,m,s) { t,v,AD_ENTRY1s(f,m,s),Common::EN_ANY,Common::kPlatformMacintosh,ADGF_DEFAULT,GUIO0()} static const ADGameDescription gameDescriptions[] = { - FANGAME("3rd Floor", "913812a1ac7a6b0e48dadd1afa1c7763", 281409), - BIGGAME("afm", "v1.8", "Another Fine Mess 1.8", "94a9c4f8b3dabd1846d76215a49bd221", 1420723), - BIGGAME("amot", "v1.8", "A Mess O' Trouble 1.8", "26207bdf0bb539464f136f0669af885f", 1843104), + FANGAME("3rd Floor", "3ed49d2163e46d2c9b33fd80927d9e22", 281409), + FANGAME("3rd Floor", "3ed49d2163e46d2c9b33fd80927d9e22", 281423), // alt version + BIGGAME("afm", "v1.8", "Another Fine Mess 1.8", "abc7188469a9a7083fd4caec55a4f76e", 1420723), + BIGGAME("amot", "v1.8", "A Mess O' Trouble 1.8", "6b59e5bb9a4b74ecdd9f66d4e36a59cf", 1843104), // No Next on the first screen? - FANGAME("Brownie's Dream", "94a9c4f8b3dabd1846d76215a49bd221", 440704), - FANGAMEN("Brownie's Time Travels", "Brownie's Time Travels v1.2", "94a9c4f8b3dabd1846d76215a49bd221", 471589), - FANGAME("Bug Hunt", "595117cbed33e8de1ab3714b33880205", 195699), - BIGGAME("cantitoe", "", "Camp Cantitoe", "913812a1ac7a6b0e48dadd1afa1c7763", 616985), + FANGAME("Brownie's Dream", "6fdcce532bcd50b7e4f3f6bab50a0ee6", 440704), + FANGAMEN("Brownie's Time Travels", "Brownie's Time Travels v1.2", "55842a100b56e236c5ad69563e01fc24", 471589), + FANGAME("Bug Hunt", "738e2e8a1020be48c5ef42da571674ae", 195699), + FANGAME("Bug Hunt", "118a41121143488719d28daa9af8cd39", 195779), // alt version + BIGGAME("cantitoe", "", "Camp Cantitoe", "1780c41d14b876461a19dbeceebf2a37", 616985), // Problems with letter rendering - FANGAME("Canal District", "a56aa3cd4a6e070e15ce1d5815c7be0a", 641470), - FANGAME("Carbon Copy", "913812a1ac7a6b0e48dadd1afa1c7763", 519445), + FANGAME("Canal District", "34e7a8e84b33ba8ea38b4ffd76ef074f", 641470), + FANGAME("Carbon Copy", "9e781acd63290ae390d515cffc742011", 519445), // Invalid rect in scene "FINALE" - FANGAME("Castle of Ert", "327610eb2298a9427a566288312df040", 198955), - FANGAME("Deep Angst", "b130b3c811cd89024dd5fdd2b71f70b8", 329550), - FANGAME("Deep Ennui", "913812a1ac7a6b0e48dadd1afa1c7763", 86075), + FANGAME("Castle of Ert", "a45b439bb3a9c8a4a14b996024222068", 198955), + FANGAMEN("Castle of Ert", "Castle of Ert.1", "a45b439bb3a9c8a4a14b996024222068", 198983), // alt version + FANGAMEND("Death Mall", "Death Mall Demo", "1c78fc15fb037b242a0bc6bac7d4d889", 254874), + FANGAME("Deep Angst", "7f8821f7b279269a91f9aadfed98eec0", 329550), // Original gile name "Deep AngstтЂ" + FANGAME("Deep Ennui", "7fa4368834a22a9d4b7246a6297b455f", 86075), // Polygons with ignored byte 1 - FANGAME("Double Trouble", "1652e36857a04c01dc560234c4818619", 542371), - BIGGAME("drakmythcastle", "disk I", "Drakmyth Castle disk I of II", "94a9c4f8b3dabd1846d76215a49bd221", 793784), - BIGGAME("drakmythcastle", "disk II", "Drakmyth Castle II", "cc978cc9a5256724702463cb5aaaffa0", 1685659), + FANGAME("Double Trouble", "3f0c032377d87704267283380800633a", 542371), + BIGGAME("drakmythcastle", "disk I", "Drakmyth Castle disk I of II", "5b1fd760fbc081c608acebfe1d07a58a", 793784), + BIGGAME("drakmythcastle", "disk II", "Drakmyth Castle II", "1116f9c2c781f79e1f9c868b51ae7fa5", 1685659), // Crash at start in GUI rendering - FANGAME("Dune Eternity", "94a9c4f8b3dabd1846d76215a49bd221", 290201), // Original file name is "***DUNE ETERNITY*** " - FANGAMEN("Dungeon World II", "DungeonWorld2", "0154ea11d3cbb536c13b4ae9e6902d48", 230199), - FANGAME("Edg's World", "913812a1ac7a6b0e48dadd1afa1c7763", 106769), - FANGAME("Eidisi I", "595117cbed33e8de1ab3714b33880205", 172552), + FANGAME("Dune Eternity", "6b29f82e235815ffc4c9f30dc09968dd", 290201), // Original file name is "***DUNE ETERNITY*** " + FANGAMEN("Dungeon World II", "DungeonWorld2", "753df07166ca48e303d782cc72dd4053", 230199), + // Made for bigger resolution + FANGAME("Dynasty of Dar", "b2e9a5cca28acb85617b1477a5fca3e2", 275693), + FANGAME("Edg's World", "0a3a3aaa36088c514b668f1f62120006", 106769), + FANGAME("Eidisi I", "3d778c0fe7addf5f29e7593ba0fd3953", 172552), + FANGAME("Eidisi I", "8c2fb325a49344568c5536bba36a2556", 172566), // alt version // Problems(?) with text on the first screen - FANGAMEN("Enchanted Pencils", "Enchanted Pencils 0.99 (PG)", "595117cbed33e8de1ab3714b33880205", 408913), - FANGAME("Escape from School!", "913812a1ac7a6b0e48dadd1afa1c7763", 50105), - FANGAME("Everyman 1", "4b0e1a1fbaaa4930accd0f9f0e1519c7", 335705), - FANGAME("Exploration Zeta!", "c477921aeee6ed0f8997ba44447eb2d0", 366599), + FANGAMEN("Enchanted Pencils", "Enchanted Pencils 0.99 (PG)", "9a9777a83e58bebfa6f1662d5e236384", 408913), + FANGAME("Escape!", "3ada261c2d1d9ce6b9da068237472689", 65075), // Original file name "Escape!т " + FANGAME("Escape from School!", "2055747bb874052333190eb993246a7f", 50105), + FANGAME("Escape from School!", "fcc581e52d1fc8ea4603d7c953fa935a", 50119), // Original file name "Escape from School!т " + FANGAME("Everyman 1", "e20cebf0091a1b1bf023aac6f28c9011", 335705), + FANGAME("Exploration Zeta!", "6127d9c04ad68f0cbb5f6aa1d95b48a2", 366599), + // Cannot proceed past the first scene + FANGAMEND("Explorer", "Explorer DEMO", "a9ebdecf6c8de95a03e593d877dacc13", 461228), // Crash in console rendering on the first scene - FANGAME("Fantasy Quest", "4b0e1a1fbaaa4930accd0f9f0e1519c7", 762754), - FANGAME("Find the Heart", "595117cbed33e8de1ab3714b33880205", 106235), // From Joshua's Worlds 1.0 - // Problems with window overlay - FANGAMEN("Jumble", "LSJUMBLE", "e12ec4d76d48bdc86567c5e63750547e", 647339), // Original file name is "LSJUMBLEт " - FANGAME("Karth of the Jungle", "595117cbed33e8de1ab3714b33880205", 96711), - FANGAME("Karth of the Jungle", "595117cbed33e8de1ab3714b33880205", 96960), // Alternative version - FANGAME("Karth of the Jungle II", "c106835ab4436de054e03aec3ce904ce", 201053), - FANGAMEN("Little Pythagoras", "Little Pythagoras 1.1.1", "94a9c4f8b3dabd1846d76215a49bd221", 628821), - FANGAME("Lost Crystal", "8174c81ea1858d0079ae040dae2cefd3", 771072), + FANGAME("Fantasy Quest", "b42b0e86e2c84464283640c74b25e015", 762754), + FANGAME("Find the Heart", "aa244c15f2ba8cef468714be34223acd", 106235), // From Joshua's Worlds 1.0 + FANGAME("Find the Heart", "a6834cb230cea1953f5bf1f8f7aacabd", 105885), // From Joshua's Worlds. Alt version + FANGAME("Find the Heart", "a6834cb230cea1953f5bf1f8f7aacabd", 105871), // Standalone + FANGAMEN("Fortune Teller", "Fortune Teller 1.1", "7d2628eeea67b33379e01c0aef8dd196", 73931), + FANGAMEN("Haunted House", "Haunted House 1.5", "5db2f95c7abaa9d060b94271a5bc57f8", 177500), + // Cropped graphics on first scene + FANGAME("Intro to Gothic", "6f732eaad6e3b85795f8ee6c6a40d837", 208067), + // No Next button in intro + FANGAME("Jamie the Demon Slayer", "fa0ca9618c18425b6d9bf913f762d91b", 232789), + FANGAMEN("Journey", "The Journey 1.6.2 US", "e66f37472e1414a088eb5d5acc4df794", 820572), + FANGAMEN("Jumble", "LSJUMBLE", "7c46851d2f90c7da9efe40b1688869c2", 647339), // Original file name is "LSJUMBLEт " + FANGAME("Karth of the Jungle", "5f2346834821dc3c4008e139cd37b3cb", 96711), + FANGAME("Karth of the Jungle", "444f9426f342135fbcc32180e5ba5b1c", 96960), // Alternative version + FANGAME("Karth of the Jungle II", "32161b27de894fd9e3f054afc4013f34", 201053), + FANGAMEN("Little Pythagoras", "Little Pythagoras 1.1.1", "75906fa955de695ac3e8164e7d88ac7b", 628821), + FANGAME("Lost Crystal", "d5e27a83f2884a24c6ec26c6cb776fe9", 771072), // Crash in design drawing on startup - FANGAMEN("Lost In Kookyville", "Lost In Kookyville 1.2.4", "e6cea2234cee9d0dba7be10bc1ad6055", 721569), - FANGAME("Magic Rings", "913812a1ac7a6b0e48dadd1afa1c7763", 109044), + FANGAMEN("Lost In Kookyville", "Lost In Kookyville 1.2.4", "5ab6259706b33230dbfba05618c2c5c9", 721569), + FANGAME("Magic Rings", "450e986694b96f3b9e6cc64e57b753dc", 109044), // No way to click on the house - FANGAME("Messy House", "913812a1ac7a6b0e48dadd1afa1c7763", 177120), - FANGAME("Midnight Snack", "913812a1ac7a6b0e48dadd1afa1c7763", 67952), - FANGAME("Midnight Snack", "913812a1ac7a6b0e48dadd1afa1c7763", 67966), // Alt version - FANGAME("Minitorian", "913812a1ac7a6b0e48dadd1afa1c7763", 586464), - FANGAME("M'Lord's Warrior", "7d30b6e68ecf197b2d15492630bdeb89", 465639), // Original file name is "M'Lord's Warrior т " + FANGAME("Messy House", "705df61da9e7d742b7ad678e59eb7bfb", 177120), + FANGAME("Midnight Snack", "76986389f9a08dd95450c8b9cf408653", 67952), + FANGAME("Midnight Snack", "76986389f9a08dd95450c8b9cf408653", 67966), // Alt version + FANGAME("Mike's House", "3d23c2b88cefd958bcbc4d4c711003d8", 87357), + FANGAME("Minitorian", "15fbb2bd75d83155ed21edbc5dc9558f", 586464), + FANGAME("M'Lord's Warrior", "0bebb2c62529c89590f6c5be6e1e9838", 465639), // Original file name is "M'Lord's Warrior т " // Unhandled comparison case - FANGAME("Mountain of Mayhem", "4b0e1a1fbaaa4930accd0f9f0e1519c7", 750003), // Original file name "Mountain of Mayhem т " + FANGAME("Mountain of Mayhem", "4088fc534042081b7ab7b49675ab4a6e", 750003), // Original file name "Mountain of Mayhem т " // No way to pass through the first screen - FANGAME("Nightcrawler Ned", "94a9c4f8b3dabd1846d76215a49bd221", 366542), + FANGAME("Nightcrawler Ned", "0cf27bf82de299c69405f7910146bf00", 366542), // Crash on startup - FANGAMEN("Parrot Talk", "PARROT TALK V1", "d81f2d03a1e863f04fb1e3a5495b720e", 118936), + FANGAMEN("Parrot Talk", "PARROT TALK V1", "b1570b0779891d5d50a3cf0146d28202", 118936), // Crash on startup - FANGAMEN("Parrot Talk", "PARROT TALKV2", "d81f2d03a1e863f04fb1e3a5495b720e", 118884), - FANGAME("Pavilion", "4d991d7d1534d48d90598d86ea6d5d97", 231687), - FANGAMEN("Pencils", "Pencils.99", "913812a1ac7a6b0e48dadd1afa1c7763", 408551), + FANGAMEN("Parrot Talk", "PARROT TALKV2", "0c1e920ed3ff74b8f22eaaf0d3496d5a", 118884), + FANGAME("Pavilion", "3a33149569325a44d98544452323c819", 231687), + FANGAMEN("Pencils", "Pencils.99", "9c200938488565080e12989e784586e2", 408551), // Polygons with byte 1 - FANGAME("Periapt", "913812a1ac7a6b0e48dadd1afa1c7763", 406006), - FANGAME("Puzzle Piece Search", "595117cbed33e8de1ab3714b33880205", 247693), // From Joshua's Worlds 1.0 + FANGAME("Periapt", "fb4052819126b88d7e03ebc00c669a9d", 406006), + FANGAME("Psychotic!", "6b4ae6261b405e2feac58c5a2ddb67c5", 247693), + FANGAME("Puzzle Piece Search", "6b4ae6261b405e2feac58c5a2ddb67c5", 247693), // From Joshua's Worlds 1.0 + FANGAME("The Puzzle Piece Search", "fb99797c429c18ec68418fdd12af17a1", 247338), // From Joshua's Worlds + FANGAME("The Puzzle Piece Search", "fb99797c429c18ec68418fdd12af17a1", 247324), // Stnadalone // Empty(?) first scene - FANGAME("Pyramid of No Return", "77a55a45f794b4d4a56703d3acce871e", 385145), - FANGAME("Queen Quest", "4b0e1a1fbaaa4930accd0f9f0e1519c7", 57026), - FANGAME("Quest for T-Rex", "913812a1ac7a6b0e48dadd1afa1c7763", 592584), + FANGAME("Pyramid of No Return", "38383ac85cc16703f13f8d82f1398123", 385145), + // Cropped graphics at the first scene + FANGAME("Psychotic!", "29b30e6aae9cc6db5eccb09f695ff25e", 367309), + FANGAME("P-W Adventure", "9bf86fb946683500d23887ef185726ab", 219216), + FANGAMEN("Pyramid of Ert", "Pyramid of Ert V1.2", "fb931cd35440a66864a434c773b496da", 315783), + FANGAME("Queen Quest", "8273e29afe64a984eb0ce7b43fdf3a59", 57039), // alt version + FANGAME("Quest for T-Rex", "f16f2cd525c9aeb4733295d8d842b902", 592584), // Crash in console rendering on the initial scene - FANGAME("Quest for the Dark Sword", "b35dd0c078da9f35fc25a455f56bb129", 572576), - FANGAME("Radical Castle", "677bfee4afeca2f7152eb8b76c85ca8d", 355601), - FANGAME("Radical Castle 1.0", "677bfee4afeca2f7152eb8b76c85ca8d", 347278), - BIGGAME("raysmaze", "v1.5", "Ray's Maze1.5", "064b16d8c20724f8debbbdc3aafde538", 1408516), - BIGGAME("raysmaze", "v1.5/alt", "Ray's Maze1.5", "92cca777800c3d31a77b5ed7f6ee49ad", 1408516), + FANGAME("Quest for the Dark Sword", "4815d9a770904b26c463b7e4fcd121c7", 572576), + FANGAME("Radical Castle", "09b70763c7a48a76240bd0e42737caaa", 355601), + FANGAME("Radical Castle 1.0", "8ae2e29ffeca52a5c7fae66dec4764a3", 347278), + BIGGAME("raysmaze", "v1.5", "Ray's Maze1.5", "521583e59bdc1d611f963cef1dc25869", 1408516), + BIGGAME("raysmaze", "v1.5/alt", "Ray's Maze1.5", "120e65bec953b981b2e0aed45ad45d70", 1408516), + // Next button is not visible + FANGAME("Ray's World Builder Demo", "d252ee8e38c9abc50455d071a367d031", 116056), // Unhandled comparison case - FANGAME("Sands of Time", "913812a1ac7a6b0e48dadd1afa1c7763", 122672), // Original file name "Sands of Timeт " - BIGGAME("scepters", "", "Scepters", "3311deef8bf82f0b4b1cfa15a3b3289d", 346595), + FANGAME("Sands of Time", "b00ea866cb04cd87124e5720bc2c84c7", 122672), // Original file name "Sands of Timeт " + BIGGAME("scepters", "", "Scepters", "f8db17cd96be056cf8a8bb9cfe46cf3a", 346595), + BIGGAME("scepters", "", "Scepters", "1fd7ca93ef16f4752fb46ee9cfa0949a", 347540), // alt version + FANGAME("Schmoozer", "e0f416bae626e2c638055b7f495d8c78", 221500), // ??? problems with dog bitmap? - FANGAMEN("Space Adventure", "SpaceAdventure", "f9f3f1c419f56955f7966355b34ea5c8", 155356), - FANGAMEN("Spear of Destiny", "SpearOfDestiny", "913812a1ac7a6b0e48dadd1afa1c7763", 333665), // Original file name "SpearOfDestinyт " - FANGAME("Star Trek", "44aaef4806578700429de5aaf95c266e", 53320), - FANGAME("Strange Disappearance", "d81f2d03a1e863f04fb1e3a5495b720e", 772282), + FANGAMEN("Space Adventure", "SpaceAdventure", "7b6c883b3510e21cfabf4c8caaeb1f16", 155356), + FANGAMEN("Space Adventure", "SpaceAdventure", "3bd6fc9327f35db5390a9bf86afcd872", 155356), // alt version + FANGAMEN("Spear of Destiny", "SpearOfDestiny", "f1252ff34dd279f4ec1844bb403a578c", 333665), // Original file name "SpearOfDestinyт " + FANGAME("Star Trek", "fe20d06bc50c7fcebda0db533e141d4a", 53320), + FANGAME("Strange Disappearance", "782fae517f7374cd7f43f428331ce445", 772282), // Code 0x03 in text - FANGAME("Swamp Witch", "913812a1ac7a6b0e48dadd1afa1c7763", 739781), // Original file name "Swamp Witchт " - FANGAME("Sweetspace Now!", "e12ec4d76d48bdc86567c5e63750547e", 123813), // Comes with Jumble + FANGAME("Swamp Witch", "4f146c0a5c59e7d4717a0423271fa89d", 739781), // Original file name "Swamp Witchт " + FANGAME("Sweetspace Now!", "1d419bc0b04c51468ddc40a90125bf00", 123813), // Comes with Jumble // Wrong scrolling in the first console text - FANGAMEN("Sword of Siegfried", "Sword of Siegfried 1.0", "913812a1ac7a6b0e48dadd1afa1c7763", 234763), - FANGAME("Time Bomb", "4b0e1a1fbaaa4930accd0f9f0e1519c7", 64564), - FANGAME("Time Bomb", "4b0e1a1fbaaa4930accd0f9f0e1519c7", 64578), // Alt version - FANGAMEND("The Ashland Revolution", "The Ashland Revolution Demo", "913812a1ac7a6b0e48dadd1afa1c7763", 145023), // Original file name "The Ashland Revolution Demoт " - FANGAME("The Axe-orcist", "94a9c4f8b3dabd1846d76215a49bd221", 308764), - FANGAMEN("The Hotel Caper", "The Hotel Caper V1.0", "595117cbed33e8de1ab3714b33880205", 231969), + FANGAMEN("Sword of Siegfried", "Sword of Siegfried 1.0", "1ee92830690f89ea142ac0847176a0c3", 234763), + FANGAME("Terrorist", "68208fa5e426312fb12402894add5e4a", 524469), // Original file name "Terroristт " + FANGAME("Time Bomb", "b7a369d57d43ec8d9fd53832fd38d7db", 64564), + FANGAME("Time Bomb", "b7a369d57d43ec8d9fd53832fd38d7db", 64578), // Alt version + FANGAMEND("The Ashland Revolution", "The Ashland Revolution Demo", "3c7a1bdeab48a077a4f54fe69da61a9f", 145023), // Original file name "The Ashland Revolution Demoт " + FANGAME("The Axe-orcist", "bfdf6a4ce87e6b368977af3b683466db", 308764), + FANGAMEN("The Hotel Caper", "The Hotel Caper V1.0", "0d11a6ca1357e27ffff5231fe89cc429", 231969), + FANGAMEN("The Hotel Caper", "The Hotel Caper V1.0", "6c80fa6a36d16aa0edef86d8800c90db", 231969), // alt version // Invalid rect in scene "Access Tube 1" - FANGAMEN("The Phoenix v1.2", "The Phoenix", "4b0e1a1fbaaa4930accd0f9f0e1519c7", 431640), - FANGAME("The Sultan's Palace", "358799d446ee4fc12f793febd6c94b95", 456855), + FANGAMEN("The Phoenix v1.2", "The Phoenix", "0a4a01b83c993408ae824cc4f63957ea", 431640), + FANGAME("The Phoenix", "0a4a01b83c993408ae824cc4f63957ea", 431643), + FANGAME("The Sultan's Palace", "98c845323489344d7e2c9d1c3e53d1fc", 456855), // Admission for on 3rd screen is messed up - FANGAME("The Tower", "435f420b9dff895ae1ddf1338040c51d", 556539), + FANGAME("The Tower", "135fe861928d15b5acd8b355460c54bf", 556539), // Polygons with ignored byte 1 and 2 on second scene - FANGAME("The Village", "913812a1ac7a6b0e48dadd1afa1c7763", 314828), + FANGAME("The Village", "b9b5cfbfc7f482eae7587b55edc135ed", 314828), + FANGAME("The Wizard's Apprentice", "7eff3cb7d1a3f59639c62cf196039745", 782824), + // Messed up first scene + FANGAMEND("Tombworld", "Demo TombWorld", "f7c86166e29fb8b57f7a1400d4963a4e", 664252), // Original file name "Demo TombWorldТЉ" // Doesn't go past first scene - BIGGAME("twisted", "", "Twisted! 1.6", "26207bdf0bb539464f136f0669af885f", 960954), - FANGAME("Wishing Well", "913812a1ac7a6b0e48dadd1afa1c7763", 103688), - FANGAME("Wizard's Warehouse", "913812a1ac7a6b0e48dadd1afa1c7763", 159748), - FANGAME("ZikTuria", "418e74ca71029a1e9db80d0eb30c0843", 52972), - FANGAME("Zoony", "539a64151426edc92da5eedadf39f23c", 154990), // original filename "ZoonyтЂ" + BIGGAME("twisted", "", "Twisted! 1.6", "97ab265eddf0cfed6d43d062c853cbc0", 960954), + FANGAME("Volcano II", "4dbb7ec6111c0f872da8ed8ba14763c9", 82991), // Original file name "Volcano IIт " + FANGAME("Wishing Well", "ece06c419cbb2d32941e6b5c7d9d7c1a", 103688), + FANGAME("Wizard's Warehouse", "ee1b86841583e2b58ac39bf97017dc7b", 159748), + FANGAMEN("Wizard's Warehouse 2", "WizWarehouse 2.0", "6502bd974fe149fe76d6d5ae9d1e6878", 230870), + FANGAME("ZikTuria", "1b934fca68d633d231dccd2047d2d274", 52972), + FANGAME("Zoony", "7bb293b81117cbd974ce54fafa06f258", 154990), // original filename "ZoonyтЂ" AD_TABLE_END_MARKER }; diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp index 9dd1a24b3c..93c799e73a 100644 --- a/engines/wage/gui.cpp +++ b/engines/wage/gui.cpp @@ -50,6 +50,7 @@ #include "graphics/cursorman.h" #include "graphics/fonts/bdf.h" #include "graphics/palette.h" +#include "graphics/primitives.h" #include "wage/wage.h" #include "wage/design.h" @@ -237,39 +238,20 @@ void Gui::draw() { return; } - if (_scene != _engine->_world->_player->_currentScene || _sceneDirty) { - _scene = _engine->_world->_player->_currentScene; - - drawDesktop(); - + if (_scene != _engine->_world->_player->_currentScene) _sceneDirty = true; - _consoleDirty = true; - _menuDirty = true; - _consoleFullRedraw = true; - - _scene->paint(&_screen, _scene->_designBounds->left, _scene->_designBounds->top); - _sceneArea.left = _scene->_designBounds->left + kBorderWidth - 2; - _sceneArea.top = _scene->_designBounds->top + kBorderWidth - 2; - _sceneArea.setWidth(_scene->_designBounds->width() - 2 * kBorderWidth); - _sceneArea.setHeight(_scene->_designBounds->height() - 2 * kBorderWidth); + if (_sceneDirty || _bordersDirty) + drawDesktop(); - _consoleTextArea.left = _scene->_textBounds->left + kBorderWidth - 2; - _consoleTextArea.top = _scene->_textBounds->top + kBorderWidth - 2; - _consoleTextArea.setWidth(_scene->_textBounds->width() - 2 * kBorderWidth); - _consoleTextArea.setHeight(_scene->_textBounds->height() - 2 * kBorderWidth); + if (_sceneIsActive) { + drawConsole(); + drawScene(); + } else { + drawScene(); + drawConsole(); } - if (_scene && (_bordersDirty || _sceneDirty)) - paintBorder(&_screen, _sceneArea, kWindowScene); - - // Render console - if (_consoleDirty || _consoleFullRedraw) - renderConsole(&_screen, _consoleTextArea); - - if (_bordersDirty || _consoleDirty || _consoleFullRedraw) - paintBorder(&_screen, _consoleTextArea, kWindowConsole); - if (_menuDirty) _menu->render(); @@ -287,6 +269,41 @@ void Gui::draw() { _consoleFullRedraw = false; } +void Gui::drawScene() { + if (!_sceneDirty && !_bordersDirty) + return; + + _scene = _engine->_world->_player->_currentScene; + + _sceneDirty = true; + _consoleDirty = true; + _menuDirty = true; + _consoleFullRedraw = true; + + _scene->paint(&_screen, _scene->_designBounds->left, _scene->_designBounds->top); + + _sceneArea.left = _scene->_designBounds->left + kBorderWidth - 2; + _sceneArea.top = _scene->_designBounds->top + kBorderWidth - 2; + _sceneArea.setWidth(_scene->_designBounds->width() - 2 * kBorderWidth); + _sceneArea.setHeight(_scene->_designBounds->height() - 2 * kBorderWidth); + + _consoleTextArea.left = _scene->_textBounds->left + kBorderWidth - 2; + _consoleTextArea.top = _scene->_textBounds->top + kBorderWidth - 2; + _consoleTextArea.setWidth(_scene->_textBounds->width() - 2 * kBorderWidth); + _consoleTextArea.setHeight(_scene->_textBounds->height() - 2 * kBorderWidth); + + paintBorder(&_screen, _sceneArea, kWindowScene); +} + +// Render console +void Gui::drawConsole() { + if (!_consoleDirty && !_consoleFullRedraw && !_bordersDirty) + return; + + renderConsole(&_screen, _consoleTextArea); + paintBorder(&_screen, _consoleTextArea, kWindowConsole); +} + void Gui::drawBox(Graphics::Surface *g, int x, int y, int w, int h) { Common::Rect r(x, y, x + w + 1, y + h + 1); @@ -310,7 +327,17 @@ const int arrowPixels[ARROW_H][ARROW_W] = { {0,1,1,1,1,1,1,1,1,1,1,0}, {1,1,1,1,1,1,1,1,1,1,1,1}}; -void Gui::paintBorder(Graphics::Surface *g, Common::Rect &r, WindowType windowType, int highlightedPart) { +static void drawPixelInverted(int x, int y, int color, void *data) { + Graphics::Surface *surface = (Graphics::Surface *)data; + + if (x >= 0 && x < surface->w && y >= 0 && y < surface->h) { + byte *p = (byte *)surface->getBasePtr(x, y); + + *p = *p == kColorWhite ? kColorBlack : kColorWhite; + } +} + +void Gui::paintBorder(Graphics::Surface *g, Common::Rect &r, WindowType windowType, int highlightedPart, float scrollPos, float scrollSize) { bool active = false, scrollable = false, closeable = false, drawTitle = false; const int size = kBorderWidth; int x = r.left - size; @@ -351,39 +378,28 @@ void Gui::paintBorder(Graphics::Surface *g, Common::Rect &r, WindowType windowTy } else { int x1 = x + width - 15; int y1 = y + size + 1; - int color1 = kColorBlack; - int color2 = kColorWhite; - if (highlightedPart == kBorderScrollUp) { - SWAP(color1, color2); - fillRect(g, x + width - kBorderWidth + 2, y + size, size - 4, r.height() / 2); - } + for (int yy = 0; yy < ARROW_H; yy++) { - for (int xx = 0; xx < ARROW_W; xx++) { - if (arrowPixels[yy][xx] != 0) { - g->hLine(x1 + xx, y1 + yy, x1 + xx, color1); - } else { - g->hLine(x1 + xx, y1 + yy, x1 + xx, color2); - } - } + for (int xx = 0; xx < ARROW_W; xx++) + g->hLine(x1 + xx, y1 + yy, x1 + xx, (arrowPixels[yy][xx] != 0 ? kColorBlack : kColorWhite)); } - fillRect(g, x + width - 13, y + size + ARROW_H, 8, r.height() / 2 - ARROW_H, color1); - color1 = kColorBlack; - color2 = kColorWhite; - if (highlightedPart == kBorderScrollDown) { - SWAP(color1, color2); - fillRect(g, x + width - kBorderWidth + 2, y + size + r.height() / 2, size - 4, r.height() / 2); - } - fillRect(g, x + width - 13, y + size + r.height() / 2, 8, r.height() / 2 - ARROW_H, color1); + fillRect(g, x + width - 13, y + size + ARROW_H, 8, height - 2 * size - 1 - ARROW_H * 2); + y1 += height - 2 * size - ARROW_H - 2; for (int yy = 0; yy < ARROW_H; yy++) { - for (int xx = 0; xx < ARROW_W; xx++) { - if (arrowPixels[ARROW_H - yy - 1][xx] != 0) { - g->hLine(x1 + xx, y1 + yy, x1 + xx, color1); - } else { - g->hLine(x1 + xx, y1 + yy, x1 + xx, color2); - } - } + for (int xx = 0; xx < ARROW_W; xx++) + g->hLine(x1 + xx, y1 + yy, x1 + xx, (arrowPixels[ARROW_H - yy - 1][xx] != 0 ? kColorBlack : kColorWhite)); + } + + if (highlightedPart == kBorderScrollUp || highlightedPart == kBorderScrollDown) { + int rx1 = x + width - kBorderWidth + 2; + int ry1 = y + size + r.height() * scrollPos; + int rx2 = rx1 + size - 4; + int ry2 = ry1 + r.height() * scrollSize; + Common::Rect rr(rx1, ry1, rx2, ry2); + + Graphics::drawFilledRect(rr, kColorBlack, drawPixelInverted, g); } } if (closeable) { @@ -619,7 +635,11 @@ void Gui::mouseDown(int x, int y) { } else if (_consoleTextArea.contains(x, y)) { startMarking(x, y); } else if ((borderClick = isInBorder(_consoleTextArea, x, y)) != kBorderNone) { - paintBorder(&_screen, _consoleTextArea, kWindowConsole, borderClick); + int textFullSize = _lines.size() * _consoleLineHeight + _consoleTextArea.height(); + float scrollPos = (float)_scrollPos / textFullSize; + float scrollSize = (float)_consoleTextArea.height() / textFullSize; + + paintBorder(&_screen, _consoleTextArea, kWindowConsole, borderClick, scrollPos, scrollSize); } } diff --git a/engines/wage/gui.h b/engines/wage/gui.h index 73814d39b4..48ec41c30a 100644 --- a/engines/wage/gui.h +++ b/engines/wage/gui.h @@ -121,9 +121,12 @@ public: void enableNewGameMenus(); private: + void drawScene(); + void drawConsole(); void undrawCursor(); void drawDesktop(); - void paintBorder(Graphics::Surface *g, Common::Rect &r, WindowType windowType, int highlightedPart = kBorderNone); + void paintBorder(Graphics::Surface *g, Common::Rect &r, WindowType windowType, int highlightedPart = kBorderNone, + float scrollPos = 0.0, float scrollSize = 0.0); void renderConsole(Graphics::Surface *g, Common::Rect &r); void drawBox(Graphics::Surface *g, int x, int y, int w, int h); void fillRect(Graphics::Surface *g, int x, int y, int w, int h, int color = kColorBlack); diff --git a/engines/wage/util.cpp b/engines/wage/util.cpp index f31a83ca04..8c8af6652e 100644 --- a/engines/wage/util.cpp +++ b/engines/wage/util.cpp @@ -122,4 +122,17 @@ const char *getGenderSpecificPronoun(int gender, bool capitalize) { return capitalize ? "It" : "it"; } +bool isStorageScene(const Common::String &name) { + if (name.equalsIgnoreCase(STORAGESCENE)) + return true; + + if (name.equalsIgnoreCase("STROAGE@")) // Jumble + return true; + + if (name.equalsIgnoreCase("STORAGE@@")) // Jumble + return true; + + return false; +} + } // End of namespace Wage diff --git a/engines/wage/wage.cpp b/engines/wage/wage.cpp index e0299c8da2..aa480b63fe 100644 --- a/engines/wage/wage.cpp +++ b/engines/wage/wage.cpp @@ -281,15 +281,16 @@ void WageEngine::performInitialSetup() { debug(5, "Resetting Owners: %d", _world->_orderedObjs.size()); for (uint i = 0; i < _world->_orderedObjs.size(); i++) { Obj *obj = _world->_orderedObjs[i]; - if (!obj->_sceneOrOwner.equalsIgnoreCase(STORAGESCENE)) { + if (!isStorageScene(obj->_sceneOrOwner)) { Common::String location = obj->_sceneOrOwner; location.toLowercase(); - if (_world->_scenes.contains(location)) { - _world->move(obj, _world->_scenes[location]); + Scene *scene = getSceneByName(location); + if (scene != NULL) { + _world->move(obj, scene); } else { if (!_world->_chrs.contains(location)) { // Note: PLAYER@ is not a valid target here. - warning("Couldn't move %s to %s", obj->_name.c_str(), obj->_sceneOrOwner.c_str()); + warning("Couldn't move %s to \"%s\"", obj->_name.c_str(), obj->_sceneOrOwner.c_str()); } else { // TODO: Add check for max items. _world->move(obj, _world->_chrs[location]); @@ -301,7 +302,7 @@ void WageEngine::performInitialSetup() { bool playerPlaced = false; for (uint i = 0; i < _world->_orderedChrs.size(); i++) { Chr *chr = _world->_orderedChrs[i]; - if (!chr->_initialScene.equalsIgnoreCase(STORAGESCENE)) { + if (!isStorageScene(chr->_initialScene)) { Common::String key = chr->_initialScene; key.toLowercase(); if (_world->_scenes.contains(key) && _world->_scenes[key] != NULL) { @@ -328,13 +329,14 @@ void WageEngine::doClose() { } Scene *WageEngine::getSceneByName(Common::String &location) { - Scene *scene; if (location.equals("random@")) { - scene = _world->getRandomScene(); + return _world->getRandomScene(); } else { - scene = _world->_scenes[location]; + if (_world->_scenes.contains(location)) + return _world->_scenes[location]; + else + return NULL; } - return scene; } void WageEngine::onMove(Designed *what, Designed *from, Designed *to) { diff --git a/engines/wage/wage.h b/engines/wage/wage.h index 8ca306aea3..a0be7a70a9 100644 --- a/engines/wage/wage.h +++ b/engines/wage/wage.h @@ -75,6 +75,8 @@ typedef Common::Array<Chr *> ChrArray; typedef Common::List<Obj *> ObjList; typedef Common::List<Chr *> ChrList; +#define STORAGESCENE "STORAGE@" + enum OperandType { OBJ = 0, CHR = 1, @@ -113,7 +115,7 @@ Common::Rect *readRect(Common::SeekableReadStream *in); const char *getIndefiniteArticle(const Common::String &word); const char *prependGenderSpecificPronoun(int gender); const char *getGenderSpecificPronoun(int gender, bool capitalize); - +bool isStorageScene(const Common::String &name); typedef Common::Array<byte *> Patterns; diff --git a/engines/wage/world.h b/engines/wage/world.h index e9041139df..355d660c8d 100644 --- a/engines/wage/world.h +++ b/engines/wage/world.h @@ -50,8 +50,6 @@ namespace Wage { -#define STORAGESCENE "STORAGE@" - class Sound; class World { diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp index 39462f7a15..5a694e7ce2 100644 --- a/engines/wintermute/base/base_persistence_manager.cpp +++ b/engines/wintermute/base/base_persistence_manager.cpp @@ -183,7 +183,7 @@ void BasePersistenceManager::getSaveStateDesc(int slot, SaveStateDescriptor &des } } - desc.setSaveDate(_savedTimestamp.tm_year, _savedTimestamp.tm_mon, _savedTimestamp.tm_mday); + desc.setSaveDate(_savedTimestamp.tm_year + 1900, _savedTimestamp.tm_mon + 1, _savedTimestamp.tm_mday); desc.setSaveTime(_savedTimestamp.tm_hour, _savedTimestamp.tm_min); desc.setPlayTime(0); } diff --git a/graphics/VectorRendererSpec.cpp b/graphics/VectorRendererSpec.cpp index 26f0ced625..258d935440 100644 --- a/graphics/VectorRendererSpec.cpp +++ b/graphics/VectorRendererSpec.cpp @@ -2256,6 +2256,9 @@ drawBorderRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType color, template<typename PixelType> void VectorRendererAA<PixelType>:: drawInteriorRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType color, VectorRenderer::FillMode fill_m) { + w -= 2*Base::_strokeWidth; + h -= 2*Base::_strokeWidth; + // Do not draw empty space rounded squares. if (w <= 0 || h <= 0) { return; @@ -2272,8 +2275,6 @@ drawInteriorRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType colo r -= Base::_strokeWidth; x1 += Base::_strokeWidth; y1 += Base::_strokeWidth; - w -= 2*Base::_strokeWidth; - h -= 2*Base::_strokeWidth; rsq = r*r; PixelType *ptr_tl = (PixelType *)Base::_activeSurface->getBasePtr(x1 + r, y1 + r); diff --git a/graphics/scaler/thumbnail_intern.cpp b/graphics/scaler/thumbnail_intern.cpp index 65e327f9c2..78fb7828d7 100644 --- a/graphics/scaler/thumbnail_intern.cpp +++ b/graphics/scaler/thumbnail_intern.cpp @@ -171,7 +171,8 @@ static bool grabScreen565(Graphics::Surface *surf) { if (!screen) return false; - assert(screen->format.bytesPerPixel == 1 || screen->format.bytesPerPixel == 2); + assert(screen->format.bytesPerPixel == 1 || screen->format.bytesPerPixel == 2 + || screen->format.bytesPerPixel == 4); assert(screen->getPixels() != 0); Graphics::PixelFormat screenFormat = g_system->getScreenFormat(); @@ -197,6 +198,9 @@ static bool grabScreen565(Graphics::Surface *surf) { } else if (screenFormat.bytesPerPixel == 2) { uint16 col = READ_UINT16(screen->getBasePtr(x, y)); screenFormat.colorToRGB(col, r, g, b); + } else if (screenFormat.bytesPerPixel == 4) { + uint32 col = READ_UINT32(screen->getBasePtr(x, y)); + screenFormat.colorToRGB(col, r, g, b); } *((uint16 *)surf->getBasePtr(x, y)) = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b); diff --git a/gui/EventRecorder.cpp b/gui/EventRecorder.cpp index d0371f5e78..3f91cfa259 100644 --- a/gui/EventRecorder.cpp +++ b/gui/EventRecorder.cpp @@ -330,7 +330,7 @@ bool EventRecorder::openRecordFile(const Common::String &fileName) { } bool EventRecorder::checkGameHash(const ADGameDescription *gameDesc) { - if (_playbackFile->getHeader().hashRecords.size() != 0) { + if (_playbackFile->getHeader().hashRecords.size() == 0) { warning("Engine doesn't contain description table"); return false; } @@ -676,4 +676,3 @@ void EventRecorder::deleteTemporarySave() { } // End of namespace GUI #endif // ENABLE_EVENTRECORDER - diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index 1b95a11e03..c2deb8c61e 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -164,7 +164,7 @@ struct DrawDataInfo { DrawData id; ///< The actual ID of the DrawData item. const char *name; ///< The name of the DrawData item as it appears in the Theme Description files bool buffer; ///< Sets whether this item is buffered on the backbuffer or drawn directly to the screen. - DrawData parent; ///< Parent DrawData item, for items that overlay. E.g. kButtonIdle -> kButtonHover + DrawData parent; ///< Parent DrawData item, for items that overlay. E.g. kDDButtonIdle -> kDDButtonHover }; /** diff --git a/gui/credits.h b/gui/credits.h index cb9a10fec4..d1d3bb2147 100644 --- a/gui/credits.h +++ b/gui/credits.h @@ -535,6 +535,7 @@ static const char *credits[] = { "C0""Max Horn", "C2""(retired)", "C0""Oystein Eftevaag", +"C0""Thierry Crozat", "", "C1""Mandriva", "C0""Dominik Scherer", diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp index 20c6d3fa13..4ddf62b2fe 100644 --- a/gui/gui-manager.cpp +++ b/gui/gui-manager.cpp @@ -286,7 +286,7 @@ void GuiManager::runLoop() { Common::EventManager *eventMan = _system->getEventManager(); uint32 lastRedraw = 0; - const uint32 waitTime = 1000 / 45; + const uint32 waitTime = 1000 / 60; bool tooltipCheck = false; @@ -304,9 +304,9 @@ void GuiManager::runLoop() { // _system->updateScreen(); if (lastRedraw + waitTime < _system->getMillis(true)) { + lastRedraw = _system->getMillis(true); _theme->updateScreen(); _system->updateScreen(); - lastRedraw = _system->getMillis(true); } Common::Event event; @@ -342,9 +342,9 @@ void GuiManager::runLoop() { if (lastRedraw + waitTime < _system->getMillis(true)) { + lastRedraw = _system->getMillis(true); _theme->updateScreen(); _system->updateScreen(); - lastRedraw = _system->getMillis(true); } } diff --git a/gui/module.mk b/gui/module.mk index bbb3def96d..9e821e71a7 100644 --- a/gui/module.mk +++ b/gui/module.mk @@ -65,5 +65,10 @@ MODULE_OBJS += \ fluidsynth-dialog.o endif +ifdef USE_UPDATES +MODULE_OBJS += \ + updates-dialog.o +endif + # Include common rules include $(srcdir)/rules.mk diff --git a/gui/options.cpp b/gui/options.cpp index ba247e5f15..ecd1607e1b 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -36,6 +36,7 @@ #include "common/system.h" #include "common/textconsole.h" #include "common/translation.h" +#include "common/updates.h" #include "audio/mididrv.h" #include "audio/musicplugin.h" @@ -61,7 +62,8 @@ enum { kChooseExtraDirCmd = 'chex', kExtraPathClearCmd = 'clex', kChoosePluginsDirCmd = 'chpl', - kChooseThemeCmd = 'chtf' + kChooseThemeCmd = 'chtf', + kUpdatesCheckCmd = 'updc' }; enum { @@ -1229,6 +1231,22 @@ GlobalOptionsDialog::GlobalOptionsDialog() #endif // USE_TRANSLATION +#ifdef USE_UPDATES + _updatesPopUpDesc = new StaticTextWidget(tab, "GlobalOptions_Misc.UpdatesPopupDesc", _("Update check:"), _("How often to check ScummVM updates")); + _updatesPopUp = new PopUpWidget(tab, "GlobalOptions_Misc.UpdatesPopup"); + + const int *vals = Common::UpdateManager::getUpdateIntervals(); + + while (*vals != -1) { + _updatesPopUp->appendEntry(Common::UpdateManager::updateIntervalToString(*vals), *vals); + vals++; + } + + _updatesPopUp->setSelectedTag(Common::UpdateManager::normalizeInterval(ConfMan.getInt("updates_check"))); + + new ButtonWidget(tab, "GlobalOptions_Misc.UpdatesCheckManuallyButton", _("Check now"), 0, kUpdatesCheckCmd); +#endif + // Activate the first tab tab->setActiveTab(0); _tabWidget = tab; @@ -1367,6 +1385,19 @@ void GlobalOptionsDialog::close() { } #endif // USE_TRANSLATION +#ifdef USE_UPDATES + ConfMan.setInt("updates_check", _updatesPopUp->getSelectedTag()); + + if (g_system->getUpdateManager()) { + if (_updatesPopUp->getSelectedTag() == Common::UpdateManager::kUpdateIntervalNotSupported) { + g_system->getUpdateManager()->setAutomaticallyChecksForUpdates(Common::UpdateManager::kUpdateStateDisabled); + } else { + g_system->getUpdateManager()->setAutomaticallyChecksForUpdates(Common::UpdateManager::kUpdateStateEnabled); + g_system->getUpdateManager()->setUpdateCheckInterval(_updatesPopUp->getSelectedTag()); + } + } +#endif + } OptionsDialog::close(); } @@ -1488,6 +1519,12 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3 _fluidSynthSettingsDialog->runModal(); break; #endif +#ifdef USE_UPDATES + case kUpdatesCheckCmd: + if (g_system->getUpdateManager()) + g_system->getUpdateManager()->checkForUpdates(); + break; +#endif default: OptionsDialog::handleCommand(sender, cmd, data); } diff --git a/gui/options.h b/gui/options.h index 1e65bfd134..6f4046381d 100644 --- a/gui/options.h +++ b/gui/options.h @@ -236,6 +236,11 @@ protected: PopUpWidget *_autosavePeriodPopUp; StaticTextWidget *_guiLanguagePopUpDesc; PopUpWidget *_guiLanguagePopUp; + +#ifdef USE_UPDATES + StaticTextWidget *_updatesPopUpDesc; + PopUpWidget *_updatesPopUp; +#endif }; } // End of namespace GUI diff --git a/gui/themes/default.inc b/gui/themes/default.inc index e367bcb3c7..a23e2f4c30 100644 --- a/gui/themes/default.inc +++ b/gui/themes/default.inc @@ -1076,6 +1076,17 @@ const char *defaultXML1 = "<?xml version = '1.0'?>" "type='PopUp' " "/>" "</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" +"<widget name='UpdatesPopupDesc' " +"type='OptionsLabel' " +"/>" +"<widget name='UpdatesPopup' " +"type='PopUp' " +"/>" +"<widget name='UpdatesCheckManuallyButton' " +"type='Button' " +"/>" +"</layout>" "<widget name='KeysButton' " "type='Button' " "/>" @@ -2365,6 +2376,19 @@ const char *defaultXML1 = "<?xml version = '1.0'?>" "type='PopUp' " "/>" "</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" +"<widget name='UpdatesPopupDesc' " +"width='80' " +"height='Globals.Line.Height' " +"textalign='right' " +"/>" +"<widget name='UpdatesPopup' " +"type='PopUp' " +"/>" +"<widget name='UpdatesCheckManuallyButton' " +"type='Button' " +"/>" +"</layout>" "<widget name='KeysButton' " "type='Button' " "/>" diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip Binary files differindex 1d8b8dad05..43fcea12fd 100644 --- a/gui/themes/scummclassic.zip +++ b/gui/themes/scummclassic.zip diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx index 18c2a1f889..65724d9faf 100644 --- a/gui/themes/scummclassic/classic_layout.stx +++ b/gui/themes/scummclassic/classic_layout.stx @@ -507,6 +507,17 @@ type = 'PopUp' /> </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'UpdatesPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'UpdatesPopup' + type = 'PopUp' + /> + <widget name = 'UpdatesCheckManuallyButton' + type = 'Button' + /> + </layout> <widget name='KeysButton' type='Button' /> diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx index 6cc9eed6b3..f73f6e864b 100644 --- a/gui/themes/scummclassic/classic_layout_lowres.stx +++ b/gui/themes/scummclassic/classic_layout_lowres.stx @@ -510,6 +510,19 @@ type = 'PopUp' /> </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'UpdatesPopupDesc' + width = '80' + height = 'Globals.Line.Height' + textalign = 'right' + /> + <widget name = 'UpdatesPopup' + type = 'PopUp' + /> + <widget name = 'UpdatesCheckManuallyButton' + type = 'Button' + /> + </layout> <widget name='KeysButton' type='Button' /> diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip Binary files differindex 43826abf5e..70f7672c57 100644 --- a/gui/themes/scummmodern.zip +++ b/gui/themes/scummmodern.zip diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx index fd6a3c5cd2..c73ffa1f08 100644 --- a/gui/themes/scummmodern/scummmodern_layout.stx +++ b/gui/themes/scummmodern/scummmodern_layout.stx @@ -521,6 +521,17 @@ type = 'PopUp' /> </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'UpdatesPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'UpdatesPopup' + type = 'PopUp' + /> + <widget name = 'UpdatesCheckManuallyButton' + type = 'Button' + /> + </layout> <widget name='KeysButton' type='Button' /> diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx index 9d8f79795c..43ec0cdee1 100644 --- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx +++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx @@ -508,6 +508,19 @@ type = 'PopUp' /> </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'UpdatesPopupDesc' + width = '80' + height = 'Globals.Line.Height' + textalign = 'right' + /> + <widget name = 'UpdatesPopup' + type = 'PopUp' + /> + <widget name = 'UpdatesCheckManuallyButton' + type = 'Button' + /> + </layout> <widget name='KeysButton' type='Button' /> diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat Binary files differindex b0da793cdf..cd827ff0c2 100644 --- a/gui/themes/translations.dat +++ b/gui/themes/translations.dat diff --git a/gui/updates-dialog.cpp b/gui/updates-dialog.cpp new file mode 100644 index 0000000000..960b3f397a --- /dev/null +++ b/gui/updates-dialog.cpp @@ -0,0 +1,148 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "common/system.h" +#include "common/translation.h" +#include "common/updates.h" +#include "common/config-manager.h" + +#include "gui/updates-dialog.h" +#include "gui/gui-manager.h" +#include "gui/ThemeEval.h" +#include "gui/widgets/popup.h" + +namespace GUI { + +enum { + kYesCmd = 'YES ', + kNoCmd = 'NO ', + kCheckBoxCmd = 'CHK ' +}; + + +UpdatesDialog::UpdatesDialog() : Dialog(30, 20, 260, 124) { + + const int screenW = g_system->getOverlayWidth(); + const int screenH = g_system->getOverlayHeight(); + + int buttonWidth = g_gui.xmlEval()->getVar("Globals.Button.Width", 0); + int buttonHeight = g_gui.xmlEval()->getVar("Globals.Button.Height", 0); + + const char *message = _( + "ScummVM now supports automatic check for updates\n" + "which requires access to the Internet.\n" + "\n" + "Would you like to enable this feature?"); + const char *message2 = _("(You can always enable it in the options dialog on the Misc tab)"); + + // First, determine the size the dialog needs. For this we have to break + // down the string into lines, and taking the maximum of their widths. + // Using this, and accounting for the space the button(s) need, we can set + // the real size of the dialog + Common::Array<Common::String> lines, lines2; + int maxlineWidth = g_gui.getFont().wordWrapText(message, screenW - 2 * 20, lines); + int maxlineWidth2 = g_gui.getFont(ThemeEngine::kFontStyleTooltip).wordWrapText(message2, screenW - 2 * 20, lines2); + + _w = MAX(MAX(maxlineWidth, maxlineWidth2), (2 * buttonWidth) + 10) + 20; + + int lineCount = lines.size() + 1 + lines2.size(); + + _h = 16 + 3 * kLineHeight; + _h += buttonHeight + 8; + + _h += lineCount * kLineHeight; + + // Center the dialog + _x = (screenW - _w) / 2; + _y = (screenH - _h) / 2; + + // Each line is represented by one static text item. + int y = 10; + for (int i = 0; i < lines.size(); i++) { + new StaticTextWidget(this, 10, y, maxlineWidth, kLineHeight, + lines[i], Graphics::kTextAlignCenter); + y += kLineHeight; + } + for (int i = 0; i < lines2.size(); i++) { + new StaticTextWidget(this, 10, y, maxlineWidth2, kLineHeight, + lines2[i], Graphics::kTextAlignCenter, 0, ThemeEngine::kFontStyleTooltip); + y += kLineHeight; + } + + y += kLineHeight; + _updatesCheckbox = new CheckboxWidget(this, 10, y, _w, kLineHeight, _("Check for updates automatically"), 0, kCheckBoxCmd); + + y += kLineHeight + 3; + + _updatesPopUp = new PopUpWidget(this, 10, y, _w - 20, g_gui.xmlEval()->getVar("Globals.PopUp.Height", kLineHeight)); + + const int *vals = Common::UpdateManager::getUpdateIntervals(); + + while (*vals != -1) { + _updatesPopUp->appendEntry(Common::UpdateManager::updateIntervalToString(*vals), *vals); + vals++; + } + + _updatesPopUp->setSelectedTag(Common::UpdateManager::kUpdateIntervalOneWeek); + + int yesButtonPos = (_w - (buttonWidth * 2)) / 2; + int noButtonPos = ((_w - (buttonWidth * 2)) / 2) + buttonWidth + 10; + + _yesButton = new ButtonWidget(this, yesButtonPos, _h - buttonHeight - 8, buttonWidth, buttonHeight, + _("Proceed"), 0, kYesCmd, Common::ASCII_RETURN); + _noButton = new ButtonWidget(this, noButtonPos, _h - buttonHeight - 8, buttonWidth, buttonHeight, + _("Cancel"), 0, kNoCmd, Common::ASCII_ESCAPE); + + _updatesPopUp->setEnabled(false); + _yesButton->setEnabled(false); +} + +void UpdatesDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { + if (cmd == kYesCmd) { + ConfMan.setInt("updates_check", _updatesPopUp->getSelectedTag()); + + if (g_system->getUpdateManager()) { + if (_updatesCheckbox->getState() == false || + _updatesPopUp->getSelectedTag() == Common::UpdateManager::kUpdateIntervalNotSupported) { + g_system->getUpdateManager()->setAutomaticallyChecksForUpdates(Common::UpdateManager::kUpdateStateDisabled); + } else { + g_system->getUpdateManager()->setAutomaticallyChecksForUpdates(Common::UpdateManager::kUpdateStateEnabled); + g_system->getUpdateManager()->setUpdateCheckInterval(_updatesPopUp->getSelectedTag()); + } + } + close(); + } else if (cmd == kNoCmd) { + ConfMan.setInt("updates_check", Common::UpdateManager::kUpdateIntervalNotSupported); + g_system->getUpdateManager()->setAutomaticallyChecksForUpdates(Common::UpdateManager::kUpdateStateDisabled); + + close(); + } else if (cmd == kCheckBoxCmd) { + _updatesPopUp->setEnabled(_updatesCheckbox->getState()); + _yesButton->setEnabled(_updatesCheckbox->getState()); + + draw(); + } else { + Dialog::handleCommand(sender, cmd, data); + } +} + +} // End of namespace GUI diff --git a/gui/updates-dialog.h b/gui/updates-dialog.h new file mode 100644 index 0000000000..9c429c960c --- /dev/null +++ b/gui/updates-dialog.h @@ -0,0 +1,54 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef GUI_UPDATES_DIALOG_H +#define GUI_UPDATES_DIALOG_H + +#include "gui/dialog.h" + +namespace GUI { + +class CheckboxWidget; +class CommandSender; +class ButtonWidget; +class PopUpWidget; + +/** + * Wizard for updates opt-in + */ +class UpdatesDialog : public Dialog { +public: + UpdatesDialog(); + virtual ~UpdatesDialog() {} + + void handleCommand(CommandSender *sender, uint32 cmd, uint32 data); + +private: + PopUpWidget *_updatesPopUp; + ButtonWidget *_yesButton; + ButtonWidget *_noButton; + CheckboxWidget *_updatesCheckbox; +}; + +} // End of namespace GUI + +#endif diff --git a/gui/widget.cpp b/gui/widget.cpp index 851774fd70..11b1ed66f0 100644 --- a/gui/widget.cpp +++ b/gui/widget.cpp @@ -229,20 +229,22 @@ Common::String Widget::cleanupHotkey(const Common::String &label) { #pragma mark - -StaticTextWidget::StaticTextWidget(GuiObject *boss, int x, int y, int w, int h, const Common::String &text, Graphics::TextAlign align, const char *tooltip) +StaticTextWidget::StaticTextWidget(GuiObject *boss, int x, int y, int w, int h, const Common::String &text, Graphics::TextAlign align, const char *tooltip, ThemeEngine::FontStyle font) : Widget(boss, x, y, w, h, tooltip), _align(align) { setFlags(WIDGET_ENABLED); _type = kStaticTextWidget; _label = text; + _font = font; } -StaticTextWidget::StaticTextWidget(GuiObject *boss, const Common::String &name, const Common::String &text, const char *tooltip) +StaticTextWidget::StaticTextWidget(GuiObject *boss, const Common::String &name, const Common::String &text, const char *tooltip, ThemeEngine::FontStyle font) : Widget(boss, name, tooltip) { setFlags(WIDGET_ENABLED); _type = kStaticTextWidget; _label = text; _align = g_gui.xmlEval()->getWidgetTextHAlign(name); + _font = font; } void StaticTextWidget::setValue(int value) { @@ -270,14 +272,14 @@ void StaticTextWidget::setAlign(Graphics::TextAlign align) { void StaticTextWidget::drawWidget() { - g_gui.theme()->drawText(Common::Rect(_x, _y, _x+_w, _y+_h), _label, _state, _align); + g_gui.theme()->drawText(Common::Rect(_x, _y, _x+_w, _y+_h), _label, _state, _align, ThemeEngine::kTextInversionNone, 0, true, _font); } #pragma mark - ButtonWidget::ButtonWidget(GuiObject *boss, int x, int y, int w, int h, const Common::String &label, const char *tooltip, uint32 cmd, uint8 hotkey) : StaticTextWidget(boss, x, y, w, h, cleanupHotkey(label), Graphics::kTextAlignCenter, tooltip), CommandSender(boss), - _cmd(cmd), _hotkey(hotkey), _lastTime(0) { + _cmd(cmd), _hotkey(hotkey), _lastTime(0), _duringPress(false) { if (hotkey == 0) _hotkey = parseHotkey(label); @@ -288,7 +290,7 @@ ButtonWidget::ButtonWidget(GuiObject *boss, int x, int y, int w, int h, const Co ButtonWidget::ButtonWidget(GuiObject *boss, const Common::String &name, const Common::String &label, const char *tooltip, uint32 cmd, uint8 hotkey) : StaticTextWidget(boss, name, cleanupHotkey(label), tooltip), CommandSender(boss), - _cmd(cmd), _hotkey(hotkey), _lastTime(0) { + _cmd(cmd), _hotkey(hotkey), _lastTime(0), _duringPress(false) { if (hotkey == 0) _hotkey = parseHotkey(label); setFlags(WIDGET_ENABLED/* | WIDGET_BORDER*/ | WIDGET_CLEARBG); @@ -296,13 +298,15 @@ ButtonWidget::ButtonWidget(GuiObject *boss, const Common::String &name, const Co } void ButtonWidget::handleMouseUp(int x, int y, int button, int clickCount) { - if (isEnabled() && x >= 0 && x < _w && y >= 0 && y < _h) { + if (isEnabled() && _duringPress && x >= 0 && x < _w && y >= 0 && y < _h) { startAnimatePressedState(); sendCommand(_cmd, 0); } + _duringPress = false; } void ButtonWidget::handleMouseDown(int x, int y, int button, int clickCount) { + _duringPress = true; setPressedState(); } @@ -460,9 +464,10 @@ CheckboxWidget::CheckboxWidget(GuiObject *boss, const Common::String &name, cons } void CheckboxWidget::handleMouseUp(int x, int y, int button, int clickCount) { - if (isEnabled() && x >= 0 && x < _w && y >= 0 && y < _h) { + if (isEnabled() && _duringPress && x >= 0 && x < _w && y >= 0 && y < _h) { toggleState(); } + _duringPress = false; } void CheckboxWidget::setState(bool state) { @@ -523,9 +528,10 @@ RadiobuttonWidget::RadiobuttonWidget(GuiObject *boss, const Common::String &name } void RadiobuttonWidget::handleMouseUp(int x, int y, int button, int clickCount) { - if (isEnabled() && x >= 0 && x < _w && y >= 0 && y < _h) { + if (isEnabled() && _duringPress && x >= 0 && x < _w && y >= 0 && y < _h) { toggleState(); } + _duringPress = false; } void RadiobuttonWidget::setState(bool state, bool setGroup) { diff --git a/gui/widget.h b/gui/widget.h index 9891f32b36..4f181954b5 100644 --- a/gui/widget.h +++ b/gui/widget.h @@ -168,9 +168,10 @@ class StaticTextWidget : public Widget { protected: Common::String _label; Graphics::TextAlign _align; + ThemeEngine::FontStyle _font; public: - StaticTextWidget(GuiObject *boss, int x, int y, int w, int h, const Common::String &text, Graphics::TextAlign align, const char *tooltip = 0); - StaticTextWidget(GuiObject *boss, const Common::String &name, const Common::String &text, const char *tooltip = 0); + StaticTextWidget(GuiObject *boss, int x, int y, int w, int h, const Common::String &text, Graphics::TextAlign align, const char *tooltip = 0, ThemeEngine::FontStyle font = ThemeEngine::kFontStyleBold); + StaticTextWidget(GuiObject *boss, const Common::String &name, const Common::String &text, const char *tooltip = 0, ThemeEngine::FontStyle font = ThemeEngine::kFontStyleBold); void setValue(int value); void setLabel(const Common::String &label); const Common::String &getLabel() const { return _label; } @@ -198,7 +199,7 @@ public: void handleMouseUp(int x, int y, int button, int clickCount); void handleMouseDown(int x, int y, int button, int clickCount); - void handleMouseEntered(int button) { setFlags(WIDGET_HILITED); draw(); } + void handleMouseEntered(int button) { if (_duringPress) { setFlags(WIDGET_PRESSED); } else { setFlags(WIDGET_HILITED); } draw(); } void handleMouseLeft(int button) { clearFlags(WIDGET_HILITED | WIDGET_PRESSED); draw(); } void handleTickle(); @@ -211,6 +212,7 @@ public: protected: void drawWidget(); void wantTickle(bool tickled); + bool _duringPress; private: uint32 _lastTime; }; diff --git a/gui/widgets/popup.cpp b/gui/widgets/popup.cpp index 6186492339..b10b4fb5fe 100644 --- a/gui/widgets/popup.cpp +++ b/gui/widgets/popup.cpp @@ -382,6 +382,14 @@ PopUpWidget::PopUpWidget(GuiObject *boss, const String &name, const char *toolti _selectedItem = -1; } +PopUpWidget::PopUpWidget(GuiObject *boss, int x, int y, int w, int h, const char *tooltip) + : Widget(boss, x, y, w, h, tooltip), CommandSender(boss) { + setFlags(WIDGET_ENABLED | WIDGET_CLEARBG | WIDGET_RETAIN_FOCUS | WIDGET_IGNORE_DRAG); + _type = kPopUpWidget; + + _selectedItem = -1; +} + void PopUpWidget::handleMouseDown(int x, int y, int button, int clickCount) { if (isEnabled()) { PopUpDialog popupDialog(this, x + getAbsX(), y + getAbsY()); diff --git a/gui/widgets/popup.h b/gui/widgets/popup.h index 102c7fd258..37ddc276ad 100644 --- a/gui/widgets/popup.h +++ b/gui/widgets/popup.h @@ -58,6 +58,7 @@ protected: public: PopUpWidget(GuiObject *boss, const String &name, const char *tooltip = 0); + PopUpWidget(GuiObject *boss, int x, int y, int w, int h, const char *tooltip = 0); void handleMouseDown(int x, int y, int button, int clickCount); void handleMouseWheel(int x, int y, int direction); diff --git a/po/POTFILES b/po/POTFILES index 49f3b6c372..dc4a19da2e 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -19,12 +19,14 @@ gui/recorderdialog.cpp gui/saveload-dialog.cpp gui/themebrowser.cpp gui/ThemeEngine.cpp +gui/updates-dialog.cpp gui/widget.cpp base/main.cpp common/error.cpp common/rendermode.cpp +common/updates.cpp engines/advancedDetector.cpp engines/dialogs.cpp diff --git a/po/be_BY.po b/po/be_BY.po index 5b80dc19aa..3ed608e471 100644 --- a/po/be_BY.po +++ b/po/be_BY.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.8.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: 2016-02-21 23:32+0300\n" "Last-Translator: Ivan Lukyanov <greencis@mail.ru>\n" "Language-Team: Ivan Lukyanov <greencis@mail.ru>\n" @@ -212,7 +212,7 @@ msgstr "Скінуць налады FluidSynth па змаўчанні." #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -502,7 +502,7 @@ msgstr "Абярыце дырэкторыю для захаванняў" msgid "This game ID is already taken. Please choose another one." msgstr "Гэты ID гульні ўжо выкарыстоўваецца. Калі ласка, абярыце іншы." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "~В~ыхад" @@ -590,17 +590,18 @@ msgid "Search:" msgstr "Пошук:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Загрузіць гульню:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Загрузіць" @@ -1243,7 +1244,7 @@ msgstr "Растарызатар са згладжваннем" msgid "Antialiased" msgstr "Са згладжваннем" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Ачысціць значэнне" @@ -1370,17 +1371,17 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Бурштынавы" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "Здаецца, што гульня '%s' яшчэ невядома." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" "Калі ласка, перадайце наступныя дадзеныя камандзе ScummVM разам з назвай" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "гульні, якую вы спрабуеце дадаць, і азначце яе версію, мову і г.д." @@ -1388,11 +1389,11 @@ msgstr "гульні, якую вы спрабуеце дадаць, і азначце яе версію, мову і г.д." msgid "~R~esume" msgstr "Працяг~н~уць" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "За~г~рузіць" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "За~п~ісаць" @@ -1421,9 +1422,9 @@ msgstr "Г~а~лоўнае меню" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1438,9 +1439,10 @@ msgstr "Захаваць гульню:" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1466,13 +1468,13 @@ msgstr "" "за базавай інфармацыяй, а таксама інструкцыямі пра тое, як атрымаць далейшую " "дапамогу." -#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~О~К" -#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~А~дмена" @@ -1630,11 +1632,11 @@ msgstr "Аўдыё FM-Towns" msgid "PC-98 Audio" msgstr "Аўдыё PC-98" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "Наладжваю эмулятар MT-32" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "Эмулятар MT-32" @@ -1751,11 +1753,11 @@ msgstr "Рэжым аўтадрэгу зараз" msgid "Swipe three fingers to the right to toggle." msgstr "Правядзіце трыма пальцамі направа для пераключэння." -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 msgid "OpenGL" msgstr "OpenGL" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "OpenGL (без фільтраў)" @@ -2313,14 +2315,14 @@ msgstr "Правяраю абнаўленні..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Выкарыстоўваць арыгінальныя экраны запісу/чытання гульні" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" @@ -2350,11 +2352,30 @@ msgstr "" "Уключае падтрымку мышы. Дазваляе выкарыстоўваць мыш для перамяшчэння і ў " "меню гульні." +#: engines/agi/detection.cpp:177 +#, fuzzy +msgid "Use Hercules hires font" +msgstr "Hercules Зялёны" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2364,13 +2385,13 @@ msgstr "Узнавіць гульню:" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Узнавіць" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2381,7 +2402,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2392,7 +2413,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2638,29 +2659,39 @@ msgstr "" "адкрыць адладачную кансоль ScummVM і ўвесці каманду 'import_savefile'.\n" "\n" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "" + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "~Р~эжым хуткага пераходу актываваны" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "~П~ераходы актываваны" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "~В~ыкінуць старонку" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +#, fuzzy +msgid "Show ~M~ap" msgstr "П~а~казаць карту" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +#, fuzzy +msgid "Main Men~u~" msgstr "~Г~алоўнае меню" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "~Э~фекты вады ўключаны" @@ -2781,37 +2812,37 @@ msgstr "Альтэрнатыўны ўступ" msgid "Use an alternative game intro (CD version only)" msgstr "Выкарыстоўваць альтэрнатыўны ўступ (толькі для CD-версіі гульні)" -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "Не рабіць апраксімацыю колераў EGA (поўнакаляровыя фоны)" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" "Прапускае праход апраксімацыі колераў EGA, графіка будзе паказана з усімі " "колерамі" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 msgid "Enable high resolution graphics" msgstr "Уключыць адлюстраванне графікі высокага адрознення" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 msgid "Enable high resolution graphics/content" msgstr "Уключыць графіку і кантэнт высокага адрознення" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Аддаваць перавагу лічбавым гукавым эфектам" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Аддаваць перавагу лічбавым гукавым эфектам замест сінтэзаваных" -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "Выкарыстоўваць IMF/Yamaha FB-01 для вываду MIDI" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -2819,32 +2850,32 @@ msgstr "" "Выкарыстоўваць гукавую карту IBM Music Feature ці модуль сінтэзу Yamaha " "FB-01 FM для MIDI" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "Выкарыстоўваць CD-аўдыё" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "" "Выкарыстоўваць гукавыя дарожкі з CD замест музыкі з файлаў гульні (калі " "даступна)" -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "Выкарыстоўваць курсоры Windows" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "" "Выкарыстоўваць курсоры Windows (меншыя па памеры і аднакаляровыя) замест " "курсораў DOS" -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "Выкарыстоўваць срэбныя курсоры" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" @@ -3515,7 +3546,7 @@ msgstr "Гучн. музыкі: " msgid "Subtitle speed: " msgstr "Хуткасць тытраў: " -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3524,7 +3555,7 @@ msgstr "" "Рэжым \"роднага\" MIDI патрабуе абнаўленне Roland Upgrade ад\n" "LucasArts, але не хапае %s. Пераключаюся на AdLib." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " "files for Maniac Mansion have to be in the 'Maniac' directory inside the " @@ -3707,6 +3738,15 @@ msgstr "Паказваць назвы аб'ектаў" msgid "Show labels for objects on mouse hover" msgstr "Паказвае назвы аб'ектаў пры навядзенні курсора мышы" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/ca_ES.po b/po/ca_ES.po index 857e7de99e..280adc21bd 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: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: 2013-05-05 14:16+0100\n" "Last-Translator: Jordi Vilalta Prat <jvprat@jvprat.com>\n" "Language-Team: Catalan <scummvm-devel@lists.sf.net>\n" @@ -210,7 +210,7 @@ msgstr "Retorna tots els ajustos de FluidSynth als seus valors per defecte." #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -503,7 +503,7 @@ msgid "This game ID is already taken. Please choose another one." msgstr "" "Aquest identificador de joc ja estр en њs. Si us plau, trieu-ne un altre." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "~T~anca" @@ -593,17 +593,18 @@ msgid "Search:" msgstr "Cerca:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Carrega partida:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Carrega" @@ -1258,7 +1259,7 @@ msgstr "Pintat amb antialias (16bpp)" msgid "Antialiased" msgstr "Amb antialias (16bpp)" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Neteja el valor" @@ -1385,17 +1386,17 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "El joc a '%s' sembla ser desconegut." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" "Informeu de la segќent informaciѓ a l'equip de ScummVM juntament amb el" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "nom del joc que heu provat d'afegir i la seva versiѓ/llengua/etc.:" @@ -1403,11 +1404,11 @@ msgstr "nom del joc que heu provat d'afegir i la seva versiѓ/llengua/etc.:" msgid "~R~esume" msgstr "~C~ontinua" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "C~a~rrega" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "~D~esa" @@ -1436,9 +1437,9 @@ msgstr "~R~etorna al Llanчador" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1453,9 +1454,10 @@ msgstr "Desa la partida:" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1479,13 +1481,13 @@ msgstr "" "No s'ha pogut desar la partida (%s)! Consulteu el fitxer README per a la " "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/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 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/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~C~ancelЗla" @@ -1642,11 +1644,11 @@ msgstr "" msgid "PC-98 Audio" msgstr "Рudio" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "Iniciant l'Emulador de MT-32" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "Emulador de MT-32" @@ -1764,12 +1766,12 @@ msgstr "" msgid "Swipe three fingers to the right to toggle." msgstr "" -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 #, fuzzy msgid "OpenGL" msgstr "Obre" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "" @@ -2328,14 +2330,14 @@ msgstr "Comprova les actualitzacions..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Utilitza les pantalles originals de desat/cрrrega" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" @@ -2362,11 +2364,29 @@ msgid "" "Enables mouse support. Allows to use mouse for movement and in game menus." msgstr "" +#: engines/agi/detection.cpp:177 +msgid "Use Hercules hires font" +msgstr "" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2376,13 +2396,13 @@ msgstr "Recupera la partida:" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Restaura" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2393,7 +2413,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2404,7 +2424,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2638,29 +2658,39 @@ msgid "" "\n" msgstr "" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "" + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "Mode ~Z~ip activat" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "~T~ransicions activades" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "~D~escarta la pрgina" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +#, fuzzy +msgid "Show ~M~ap" msgstr "~M~ostra el mapa" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +#, fuzzy +msgid "Main Men~u~" msgstr "~M~enњ Principal" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "~E~fecte de l'aigua activat" @@ -2784,37 +2814,37 @@ 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)" -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 #, fuzzy msgid "Enable high resolution graphics" msgstr "Activa la barra grрfica dels punts d'impacte" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 #, fuzzy msgid "Enable high resolution graphics/content" msgstr "Activa la barra grрfica dels punts d'impacte" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Prefereix efectes de so digitals" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Prefereix els efectes de so digitals en lloc dels sintetitzats" -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "Utilitza IMF/Yamaha FB-01 per la sortida MIDI" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -2822,31 +2852,31 @@ msgstr "" "Utilitza una tarja IBM Music Feature o un mђdul sintetitzador Yamaha FB-01 " "FM per la sortida MIDI" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "Utilitza l'рudio del CD" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "" "Utilitza l'рudio del CD en lloc de l'рudio intern del joc, si estр disponible" -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "Utilitza els cursors de Windows" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "" "Utilitza els cursors de Windows (mщs petits i en blanc i negre) en lloc dels " "de DOS" -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "Utilitza cursors platejats" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" @@ -3524,7 +3554,7 @@ msgstr "Volum de mњsica:" msgid "Subtitle speed: " msgstr "Velocitat de subt.:" -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3533,7 +3563,7 @@ msgstr "" "El suport de MIDI natiu requereix l'actualitzaciѓ Roland de LucasArts,\n" "perђ no s'ha trobat %s. S'utilitzarр AdLib." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 #, fuzzy msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " @@ -3713,6 +3743,15 @@ msgstr "Mostra les etiquetes dels objectes" msgid "Show labels for objects on mouse hover" msgstr "Mostra etiquetes al posar el ratolэ sobre els objectes" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 3a308f977c..05b5571c0c 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: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: 2016-02-03 22:59+0100\n" "Last-Translator: Zbynьk Schwarz <zbynek.schwarz@gmail.com>\n" "Language-Team: \n" @@ -213,7 +213,7 @@ msgstr "Resetovat veЙkerс nastavenэ FludSynth n ajejich v§chozэ hodnoty." #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -503,7 +503,7 @@ msgstr "Vyberte adresсј pro uloОenщ hry" msgid "This game ID is already taken. Please choose another one." msgstr "Toto ID hry je uО zabranщ. Vyberte si, prosэm, jinщ." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "~U~konшit" @@ -591,17 +591,18 @@ msgid "Search:" msgstr "Hledat:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Nahrсt hru:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Nahrсt" @@ -1240,7 +1241,7 @@ msgstr "Vykreslovaш s vyhlazen§mi hranami" msgid "Antialiased" msgstr "S vyhlazen§mi hranami" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Vyшistit hodnotu" @@ -1367,16 +1368,16 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Jantarovс" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "Hra v '%s' se zdс b§t neznсmс." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "Prosэm nahlaste nсsledujэcэ data t§mu ScummVM spolu se jmщnem" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "hry, kterou jste se pokusili pјidat a jejэ verzi/jazyk/atd.:" @@ -1384,11 +1385,11 @@ msgstr "hry, kterou jste se pokusili pјidat a jejэ verzi/jazyk/atd.:" msgid "~R~esume" msgstr "~P~okraшovat" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "~N~ahrсt" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "~U~loОit" @@ -1417,9 +1418,9 @@ msgstr "~N~сvrat do SpouЙtьшe" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1434,9 +1435,10 @@ msgstr "UloОit hru:" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1461,13 +1463,13 @@ msgstr "" "UloОenэ stavu hry selhalo (%s)! Prosэm pјeшtьte si dokumentaci pro zсkladnэ " "informace a pokyny k zэskсnэ dalЙэ podpory." -#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 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/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~Z~ruЙit" @@ -1623,11 +1625,11 @@ msgstr "Zvuk FM-Towns" msgid "PC-98 Audio" msgstr "Zvuk PC-98" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "Zavсdэm MT-32 Emulсtor" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "MT-32 Emulсtor" @@ -1744,11 +1746,11 @@ msgstr "ReОim automatickщho taОenэ je nynэ" msgid "Swipe three fingers to the right to toggle." msgstr "Pro zapnutэ pјejeяte tјemi prsty doprava." -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 msgid "OpenGL" msgstr "OpenGL" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "OpenGL (bez filtrovсnэ)" @@ -2308,14 +2310,14 @@ msgstr "Zkontrolovat Aktualizace..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "PouОэt pљvodnэ obrazovky naшtenэ/uloОenэ" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 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" @@ -2343,11 +2345,30 @@ msgstr "" "Povolэ podporu myЙi. UmoОnэ pouОэt myЙ pro pohyb a pro ovlсdсnэ hernэch " "nabэdek." +#: engines/agi/detection.cpp:177 +#, fuzzy +msgid "Use Hercules hires font" +msgstr "Hercules Zelenс" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2357,13 +2378,13 @@ msgstr "Obnovit hru" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Obnovit" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2374,7 +2395,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2385,7 +2406,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2630,29 +2651,39 @@ msgstr "" "ladэcэ konzoli ScummVM a pouОэt pјэkaz 'import_savefile'.\n" "\n" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "" + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "~R~eОim SviЙtьnэ Aktivovсn" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "~P~јechody zapnuty" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "~Z~ahodit Strсnku" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +#, fuzzy +msgid "Show ~M~ap" msgstr "~Z~obrazit Mapu" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +#, fuzzy +msgid "Main Men~u~" msgstr "~H~lavnэ Menu" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "~E~fekt Vody Zapnut" @@ -2775,36 +2806,36 @@ msgstr "Alternativnэ њvod" msgid "Use an alternative game intro (CD version only)" msgstr "PouОэt jinou verzi њvodu (Pouze verze CD)" -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "Pјekoшit prљchod rozkladu barev EGA (pozadэ v pln§ch barvсch)" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" "Pјeskoшit prљchod rozkladu barev EGA, obraze je zobrazen v pln§ch barvсch" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 msgid "Enable high resolution graphics" msgstr "Povolit grafiku ve vysokщm rozliЙenэ" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 msgid "Enable high resolution graphics/content" msgstr "Povolit grafiku/obsah ve vysokщm rozliЙenэ" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Upјednostђovat digitсlnэ zvukovщ efekty" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Upјednostђovat digitсlnэ zvukovщ efekty pјed syntetizovan§mi" -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "PouОэt IMF/Yamaha FB-01 pro v§stup MIDI" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -2812,28 +2843,28 @@ msgstr "" "PouОэt kartu IBM Music Feature nebo modul syntetizсtoru Yamaha FB-01 FM pro " "v§stup MIDI" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "PouОэt zvuky na CD" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "PouОэt zvuky na CD mэsto ve hјe, pokud je dostupnщ" -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "PouОэt kurzory Windows" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "PouОэt kurzory Windows (menЙэ a шernobэlщ) mэsto kurzorљ z DOS" -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "PouОэt stјэbrnщ kurzory" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "PouОэt alternativnэ sadu stјэbrn§ch kurzorљ mэsto standardnэch zlat§ch" @@ -3503,7 +3534,7 @@ msgstr "Hlasitost hudby:" msgid "Subtitle speed: " msgstr "Rychlost titulkљ:" -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3512,7 +3543,7 @@ msgstr "" "Pјirozenс podpora MIDI vyОaduje Aktualizaci Roland od LucasArts,\n" "ale %s chybэ. Mэsto toho je pouОit AdLib." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " "files for Maniac Mansion have to be in the 'Maniac' directory inside the " @@ -3687,6 +3718,15 @@ msgstr "Zobrazit jmenovky objektљ" msgid "Show labels for objects on mouse hover" msgstr "Zobrazit jmenovky objektљ pјi najetэ myЙi" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/da_DK.po b/po/da_DK.po index 934297bd80..15cac81e94 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: 2016-02-25 21:08+0100\n" "Last-Translator: Steffen Nyeland <steffen@nyeland.dk>\n" "Language-Team: Steffen Nyeland <steffen@nyeland.dk>\n" @@ -211,7 +211,7 @@ msgstr "Nulstil alle FluidSynth indstillinger til deres standard vцrdier." #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -503,7 +503,7 @@ msgstr "Vцlg bibliotek til spil gemmer" msgid "This game ID is already taken. Please choose another one." msgstr "Dette spil ID er allerede i brug. Vцlg venligst et andet." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "~A~fslut" @@ -591,17 +591,18 @@ msgid "Search:" msgstr "Sјg:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Indlцs spil:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Indlцs" @@ -1239,7 +1240,7 @@ msgstr "Antialias renderer" msgid "Antialiased" msgstr "Antialias" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Slet vцrdi" @@ -1366,17 +1367,17 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules brun" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "Spillet i '%s' ser ud til at vцre ukendt." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" "Venligst, rapportere fјlgende data til ScummVM holdet sammen med navnet" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "pх det spil, du forsјgte at tilfјje og dets version/sprog/ etc.:" @@ -1384,11 +1385,11 @@ msgstr "pх det spil, du forsјgte at tilfјje og dets version/sprog/ etc.:" msgid "~R~esume" msgstr "Gen~o~ptag" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "~H~ent" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "~G~em" @@ -1417,9 +1418,9 @@ msgstr "~R~etur til oversigt" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1434,9 +1435,10 @@ msgstr "Gemmer:" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1461,13 +1463,13 @@ msgstr "" "Gem af spiltilstand fejlede (%s)! Se venligst README for grundlцggende " "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/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 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/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~F~ortryd" @@ -1623,11 +1625,11 @@ msgstr "FM Towns lyd" msgid "PC-98 Audio" msgstr "PC-98 lyd" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "Initialisere MT-32 emulator" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "MT-32 emulator" @@ -1744,11 +1746,11 @@ msgstr "Auto-trцk tilstand er nu" msgid "Swipe three fingers to the right to toggle." msgstr "Fјr tre fingre til hјjre for at skifte." -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 msgid "OpenGL" msgstr "OpenGL" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "OpenGL (Ingen filtrering)" @@ -2307,14 +2309,14 @@ msgstr "Sјg efter opdateringer..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Brug original gem/indlцs skцrme" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 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" @@ -2342,11 +2344,30 @@ msgstr "" "Aktivщr muse support. Gјr det muligt at bruge musen til bevцgelse og i spil " "menuer." +#: engines/agi/detection.cpp:177 +#, fuzzy +msgid "Use Hercules hires font" +msgstr "Hercules grјn" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2356,13 +2377,13 @@ msgstr "Gendan spil:" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Gendan" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2373,7 +2394,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2384,7 +2405,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2631,29 +2652,39 @@ msgstr "" "'import_savefile'.\n" "\n" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "" + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "~Z~ip tilstand aktiveret" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "~O~vergange aktiveret" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "Smi~d~ side" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +#, fuzzy +msgid "Show ~M~ap" msgstr "Vi~s~ kort" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +#, fuzzy +msgid "Main Men~u~" msgstr "Hoved~m~enu" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "~V~andeffekter aktiveret" @@ -2776,37 +2807,37 @@ msgstr "Alternativ intro" msgid "Use an alternative game intro (CD version only)" msgstr "Brug en alternativ spil intro (kun CD version)" -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "Skip EGA farvereducering (fuldfarvet baggrunde)" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" "Spring farvereducering i EGA spil over, grafikken bliver vist med fulde " "farver" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 msgid "Enable high resolution graphics" msgstr "Aktivщr grafik i hјj oplјsning" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 msgid "Enable high resolution graphics/content" msgstr "Aktivщr hјj oplјsnings grafik/indhold" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Foretrцk digitale lydeffekter" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Foretrцk digitale lydeffekter i stedet for syntetiserede" -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "Brug IMF/Yamaha FB-01 til MIDI-udgang" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -2814,28 +2845,28 @@ msgstr "" "Bruge et IBM Musik Feature-kort eller et Yamaha FB-01 FM synth modul til " "MIDI-udgang" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "Brug CD lyd" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "Brug cd-lyd i stedet for lyd fra spillet, hvis tilgцngelige" -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "Brug Windows markјr" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "Brug Windows-markјrer (mindre og monokrome) i stedet for dem fra DOS" -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "Brug sјlv markјr" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" @@ -3506,7 +3537,7 @@ msgstr "Musik lydstyrke: " msgid "Subtitle speed: " msgstr "Tekst hastighed: " -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3515,7 +3546,7 @@ msgstr "" "Indbygget MIDI understјttelse krцver Roland opgradering fra LucasArts,\n" "men %s mangler. Bruger AdLib i stedet." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " "files for Maniac Mansion have to be in the 'Maniac' directory inside the " @@ -3695,6 +3726,15 @@ msgstr "Vis labels pх genstande" msgid "Show labels for objects on mouse hover" msgstr "Vis labels for genstande musen er henover" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/de_DE.po b/po/de_DE.po index dbfeba57d5..7dd4607077 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.8.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2016-02-20 21:22+0000\n" -"PO-Revision-Date: 2016-02-22 20:53+0100\n" -"Last-Translator: Simon Sawatzki <SimSaw@gmx.de>\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" +"PO-Revision-Date: 2016-03-28 15:00+0100\n" +"Last-Translator: Lothar Serra Mari <scummvm@rootfather.de>\n" "Language-Team: Simon Sawatzki <SimSaw@gmx.de>, Lothar Serra Mari " "<scummvm@rootfather.de>\n" "Language: Deutsch\n" @@ -200,7 +200,7 @@ msgstr "Siebenstufig" #: gui/fluidsynth-dialog.cpp:150 msgid "Reset" -msgstr "Rќcksetzen" +msgstr "Zurќcksetzen" #: gui/fluidsynth-dialog.cpp:150 msgid "Reset all FluidSynth settings to their default values." @@ -213,7 +213,7 @@ msgstr "Setzt alle FluidSynth-Einstellungen auf ihre Standard-Werte zurќck." #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -505,7 +505,7 @@ msgstr "Verzeichnis fќr Spielstфnde auswфhlen" msgid "This game ID is already taken. Please choose another one." msgstr "Diese Spielkennung ist schon vergeben. Bitte eine andere wфhlen." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "~B~eenden" @@ -595,17 +595,18 @@ msgid "Search:" msgstr "Suchen:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Spiel laden:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Laden" @@ -1256,7 +1257,7 @@ msgstr "Kantenglфttung" msgid "Antialiased" msgstr "Kantenglфttung" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Wert lіschen" @@ -1383,18 +1384,18 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Bernst." -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "Das Spiel im Verzeichnis \"%s\" scheint nicht bekannt zu sein." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" "Bitte geben Sie die folgenden Daten auf Englisch an das ScummVM-Team weiter " "sowie" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "" "den Namen des Spiels, das Sie hinzufќgen wollten, als auch die Version/" @@ -1404,11 +1405,11 @@ msgstr "" msgid "~R~esume" msgstr "~F~ortsetzen" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "~L~aden" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "~S~peichern" @@ -1437,9 +1438,9 @@ msgstr "Zur Spiele~l~iste" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1454,9 +1455,10 @@ msgstr "Speichern:" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1480,13 +1482,13 @@ msgstr "" "Speichern des Spielstands %s fehlgeschlagen! Bitte lesen Sie die Liesmich-" "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/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 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/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~A~bbrechen" @@ -1646,11 +1648,11 @@ msgstr "FM-Towns-Audio" msgid "PC-98 Audio" msgstr "PC-98-Audio" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "MT-32-Emulator wird gestartet" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "MT-32-Emulation" @@ -1767,11 +1769,11 @@ msgstr "Automatisches Ziehen ist jetzt " msgid "Swipe three fingers to the right to toggle." msgstr "Zum Umschalten mit drei Fingern nach rechts wischen." -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 msgid "OpenGL" msgstr "OpenGL" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "OpenGL (ohne Filter)" @@ -2331,14 +2333,14 @@ msgstr "Suche nach Aktualisierungen..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Originale Spielstand-Menќs" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" @@ -2367,11 +2369,33 @@ msgstr "" "Aktiviere Maus-Unterstќtzung. Erlaubt die Verwendung der Maus zur Bewegung " "und in Menќs innerhalb des Spiels." +#: engines/agi/detection.cpp:177 +msgid "Use Hercules hires font" +msgstr "Verwende hochauflіsende Hercules-Schrift" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" +"Verwende hochauflіsende Hercules-Schriftart, wenn die Schriftarten-Datei " +"verfќgbar ist." + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "Pausiere, wenn Befehle eingegeben werden" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" +"Zeige eine Fenster mit einer Kommandozeile und pausiere das Spiel (wie in " +"SCI) anstelle einer Eingabe in Echtzeit." + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2381,13 +2405,13 @@ msgstr "Spiel laden:" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Laden" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2398,7 +2422,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2409,7 +2433,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2660,29 +2684,37 @@ msgstr "" "\"import_savefile\" verwenden.\n" "\n" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "Video vom Anflug auf Myst abspielen" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "Das Video, welches den Anflug auf Myst zeigt, wurde in der ursprќnglichen Engine nicht abgespielt." + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" -msgstr "Schneller ~R~aumwechsel aktiviert" +msgstr "~Zip-Modus aktiviert" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "мber~g~фnge aktiviert" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" -msgstr "Seite ~w~egwerfen" +msgstr "Seite ~a~blegen" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +msgid "Show ~M~ap" msgstr "~K~arte anzeigen" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +msgid "Main Men~u~" msgstr "Haupt~m~enќ" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "~W~assereffekt aktiviert" @@ -2807,37 +2839,37 @@ msgstr "Alternativer Vorspann" msgid "Use an alternative game intro (CD version only)" msgstr "Verwendet einen alternativen Vorspann (nur bei CD-Version)." -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "мberspringe EGA-Fehlerdiffusion (Vollfarbige Hintergrќnde)" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" "мberspringe Fehlerdiffusion in EGA-Spielen, Grafik wird mit allen Farben " "gezeigt" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 msgid "Enable high resolution graphics" msgstr "Aktiviere hochauflіsende Grafik." -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 msgid "Enable high resolution graphics/content" msgstr "Aktiviere hochauflіsende Grafik/Inhalte" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Digitale Gerфusch-Effekte bevorzugen" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Bevorzugt digitale Gerфusch-Effekte statt synthethisierter." -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "IMF/Yamaha FB-01 fќr MIDI-Ausgabe verwenden" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -2845,30 +2877,30 @@ msgstr "" "Verwendet eine Music-Feature-Karte von IBM oder ein Yamaha-FB-01-FM-" "Synthetisierungsmodul fќr die MIDI-Ausgabe." -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "CD-Ton verwenden" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "Verwendet CD-Ton anstatt des Tons im Spiel, sofern verfќgbar." -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "Windows-Mauszeiger verwenden" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "" "Verwendet die Windows-Mauszeiger (kleiner und schwarz-weiп) anstatt der von " "DOS." -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "Silberne Mauszeiger verwenden" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" @@ -3099,7 +3131,7 @@ msgstr "Zwischen Grafikfiltern wechseln" #: engines/scumm/help.cpp:102 msgid "Increase / Decrease scale factor" -msgstr "Grіпenverhфtlnis hіher/niedriger" +msgstr "Grіпenverhфltnis hіher/niedriger" #: engines/scumm/help.cpp:103 msgid "Toggle aspect-ratio correction" @@ -3540,7 +3572,7 @@ msgstr "Musiklautstфrke:" msgid "Subtitle speed: " msgstr "Untertitel-Tempo:" -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3550,7 +3582,7 @@ msgstr "" "Roland-Upgrade von LucasArts, aber %s\n" "fehlt. Stattdessen wird AdLib verwendet." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " "files for Maniac Mansion have to be in the 'Maniac' directory inside the " @@ -3585,7 +3617,9 @@ msgstr "Originale Spielstand-Menќs verwenden" msgid "" "Files button in-game shows original savegame dialog rather than the ScummVM " "menu" -msgstr "Dateien-Schaltflфche im Spiel zeigt originales Spielstand-Menќ statt dem von ScummVM." +msgstr "" +"Dateien-Schaltflфche im Spiel zeigt originales Spielstand-Menќ statt dem von " +"ScummVM." #: engines/sherlock/detection.cpp:81 msgid "Pixellated scene transitions" @@ -3603,7 +3637,9 @@ msgstr "Bei Mausbewegung keine Klickpunkte anzeigen" msgid "" "Only show hotspot names after you actually click on a hotspot or action " "button" -msgstr "Zeigt Klickpunktnamen nur nach Klick auf selbigen oder auf einen Aktionspunkt." +msgstr "" +"Zeigt Klickpunktnamen nur nach Klick auf selbigen oder auf einen " +"Aktionspunkt." #: engines/sherlock/detection.cpp:101 msgid "Show character portraits" @@ -3619,7 +3655,8 @@ msgstr "Menќs in Blickfeld gleiten lassen" #: engines/sherlock/detection.cpp:112 msgid "Slide UI dialogs into view, rather than simply showing them immediately" -msgstr "Lфsst Menќs in Blickfeld gleiten anstatt sie einfach sofort anzuzeigen." +msgstr "" +"Lфsst Menќs in Blickfeld gleiten anstatt sie einfach sofort anzuzeigen." #: engines/sherlock/detection.cpp:121 msgid "Transparent windows" @@ -3733,6 +3770,17 @@ msgstr "Objektnamen zeigen" msgid "Show labels for objects on mouse hover" msgstr "Zeigt Objektbeschriftungen bei Mausberќhrung an." +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "Verwende englische Sprachausgabe" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" +"Verwende englische Sprachausgabe anstelle der deutschen, wenn eine andere " +"Sprache als Deutsch verwendet wird." + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/es_ES.po b/po/es_ES.po index 1593d4f815..2a3b08e57d 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: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: 2016-02-24 18:01+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -210,7 +210,7 @@ msgstr "Volver a los valores por defecto de las opciones de FluidSynth" #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -502,7 +502,7 @@ msgstr "Selecciona el directorio para partidas guardadas" msgid "This game ID is already taken. Please choose another one." msgstr "Esta ID ya estс siendo usada. Por favor, elige otra." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "~S~alir" @@ -590,17 +590,18 @@ msgid "Search:" msgstr "Buscar:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Cargar juego:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Cargar" @@ -1246,7 +1247,7 @@ msgstr "Suavizado" msgid "Antialiased" msgstr "Suavizado" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Eliminar valor" @@ -1373,16 +1374,16 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules сmbar" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "El juego en '%s' parece ser desconocido." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "Por favor, envэa al equipo de ScummVM esta informaciѓn junto al nombre" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "del juego que has intentado aёadir y su versiѓn/idioma/etc.:" @@ -1390,11 +1391,11 @@ msgstr "del juego que has intentado aёadir y su versiѓn/idioma/etc.:" msgid "~R~esume" msgstr "~R~eanudar" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "~C~argar" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "~G~uardar" @@ -1423,9 +1424,9 @@ msgstr "~V~olver al lanzador" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1440,9 +1441,10 @@ msgstr "Guardar partida" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1468,13 +1470,13 @@ msgstr "" "archivo README para encontrar informaciѓn bсsica e instrucciones sobre cѓmo " "obtener mсs ayuda." -#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 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/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~C~ancelar" @@ -1631,11 +1633,11 @@ msgstr "FM-Towns Audio" msgid "PC-98 Audio" msgstr "PC-98 Audio" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "Iniciando el emulador de MT-32" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "Emulador de MT-32" @@ -1752,11 +1754,11 @@ msgstr "El modo de arrastre automсtico estс" msgid "Swipe three fingers to the right to toggle." msgstr "Desliza tres dedos hacia la derecha para cambiar de modo." -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 msgid "OpenGL" msgstr "OpenGL" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "OpenGL (sin filtros)" @@ -2315,14 +2317,14 @@ msgstr "Buscar actualizaciones..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Usar pantallas de guardar/cargar originales" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" @@ -2351,11 +2353,30 @@ msgstr "" "Activa el ratѓn. Permite usar el ratѓn para moverse en el juego y en los " "menњs." +#: engines/agi/detection.cpp:177 +#, fuzzy +msgid "Use Hercules hires font" +msgstr "Hercules verde" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2365,13 +2386,13 @@ msgstr "Cargar partida:" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Cargar" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2382,7 +2403,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2393,7 +2414,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2639,29 +2660,39 @@ msgstr "" "'import_savefile'.\n" "\n" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "" + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "Modo ~Z~ip activado" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "Tra~n~siciones activadas" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "~T~irar pсgina" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +#, fuzzy +msgid "Show ~M~ap" msgstr "~M~ostrar el mapa" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +#, fuzzy +msgid "Main Men~u~" msgstr "~M~enњ principal" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "Efecto ag~u~a activado" @@ -2785,37 +2816,37 @@ 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 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "Omitir difuminado EGA (colores completos)" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" "Omitir pasada de difuminado en los juegos EGA. Los grсficos se muestran con " "los colores completos" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 msgid "Enable high resolution graphics" msgstr "Activar grсficos de alta resoluciѓn" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 msgid "Enable high resolution graphics/content" msgstr "Activar grсficos/contenido de alta resoluciѓn" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Preferir efectos de sonido digitales" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Preferir efectos de sonido digitales en vez de los sintetizados" -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "Usar IMF/Yamaha FB-01 para la salida MIDI" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -2823,29 +2854,29 @@ msgstr "" "Usar una tarjeta IBM Music o un mѓdulo sintetizador Yamaha FB-01 FM para la " "salida MIDI" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "Usar CD audio" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "Usar CD audio en vez del sonido interno del juego, si estс disponible" -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "Usar cursores de Windows" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "" "Usar los cursores de Windows (mсs pequeёos y monocromos) en vez de los de DOS" -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "Usar cursores plateados" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" @@ -3516,7 +3547,7 @@ msgstr "Volumen de la mњsica:" msgid "Subtitle speed: " msgstr "Vel. de subtэtulos:" -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3525,7 +3556,7 @@ msgstr "" "El soporte MIDI nativo requiere la actualizaciѓn Roland de LucasArts,\n" "pero %s no estс disponible. Se usarс AdLib." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " "files for Maniac Mansion have to be in the 'Maniac' directory inside the " @@ -3711,6 +3742,15 @@ msgstr "Mostrar etiquetas de objetos" msgid "Show labels for objects on mouse hover" msgstr "Muestra las etiquetas de los objetos al pasar el ratѓn" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" @@ -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: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: 2011-12-15 14:53+0100\n" "Last-Translator: Mikel Iturbe Urretxa <mikel@hamahiru.org>\n" "Language-Team: Librezale <librezale@librezale.org>\n" @@ -209,7 +209,7 @@ msgstr "Berrazarri FluidSynth-en ezarpen guztiak bere balio lehenetsietara" #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -498,7 +498,7 @@ msgstr "Partida gordeen direktorioa aukeratu" msgid "This game ID is already taken. Please choose another one." msgstr "ID hau jada erabilia izaten ari da. Mesedez, aukeratu beste bat." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "~I~rten" @@ -586,17 +586,18 @@ msgid "Search:" msgstr "Bilatu:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Jokoa kargatu:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Kargatu" @@ -1242,7 +1243,7 @@ msgstr "Errendatzaile lausotua" msgid "Antialiased" msgstr "Lausotua" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Balioa kendu:" @@ -1369,16 +1370,16 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Herkules anbar-kolorekoa" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "'%s'-(e)ko jokoa ezezaguna dela dirudi" -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "Mesedez, bidali hurrengo datuak ScummVM taldeari gehitzen saiatu zaren" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "jokoaren izen, bertsio/hizkuntza/e.a.-ekin batera:" @@ -1386,11 +1387,11 @@ msgstr "jokoaren izen, bertsio/hizkuntza/e.a.-ekin batera:" msgid "~R~esume" msgstr "~J~arraitu" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "Ka~r~gatu" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "~G~orde" @@ -1419,9 +1420,9 @@ msgstr "It~z~uli abiarazlera" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1436,9 +1437,10 @@ msgstr "Gorde jokoa:" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1462,13 +1464,13 @@ msgstr "" "Jokoaren egoera gordetzeak huts egin du (%s)! Jo ezazu README-ra oinarrizko " "informaziorako eta laguntza gehiago nola jaso jakiteko." -#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 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/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~U~tzi" @@ -1624,11 +1626,11 @@ msgstr "FM-Towns soinua" msgid "PC-98 Audio" msgstr "PC-98 Soinua" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "MT-32 emuladorea hasieratzen" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "MT-32 emuladorea" @@ -1745,11 +1747,11 @@ msgstr "Auto-arrastatzea orain:" msgid "Swipe three fingers to the right to toggle." msgstr "Pasatu hiru atzamar eskuinean gaitu/desgaitzeko." -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 msgid "OpenGL" msgstr "OpenGL" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "OpenGL (Iragazi gabe)" @@ -2308,14 +2310,14 @@ msgstr "Eguneraketak bilatzen..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Erabili jatorrizko gorde/kargatu pantailak" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" @@ -2344,11 +2346,30 @@ msgstr "" "Saguaren euskarria giatzen du. Sagua mugitzeko eta jokoko menuetan " "erabiltzea ahalbidetzen du" +#: engines/agi/detection.cpp:177 +#, fuzzy +msgid "Use Hercules hires font" +msgstr "Herkules berdea" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2358,13 +2379,13 @@ msgstr "Jokoa kargatu:" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Kargatu" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2375,7 +2396,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2386,7 +2407,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2632,29 +2653,39 @@ msgstr "" "nahi izanez gero ScummVM debug konsola ireki eta 'import_savefile'\n" "agindau erabili.\n" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "" + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "~Z~ip modua aktibaturik" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "~T~rantsizioak gaituta" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "Orria ~b~ota" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +#, fuzzy +msgid "Show ~M~ap" msgstr "~M~apa erakutsi" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +#, fuzzy +msgid "Main Men~u~" msgstr "Menu ~n~agusia" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "~U~r-efektua gaituta" @@ -2777,36 +2808,36 @@ msgstr "Sarrera alternatiboa" msgid "Use an alternative game intro (CD version only)" msgstr "Erabili sarrera alternatiboa (CD bertsioa soilik)" -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "Saihestu EGA leuntze pausua (koloretako hondoak)" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" "Saihestu leuntzea EGA jokoetan, grafikoak kolore guztiekin erakustendira" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 msgid "Enable high resolution graphics" msgstr "Gaitu erresoluzio altuko grafikoak" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 msgid "Enable high resolution graphics/content" msgstr "Gaitu erresoluzio altuko grafikoak/edukiak" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Lehenetsi soinu efektu digitalak" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Lehenetsi soinu efektu digitalak sintetizatuen ordez" -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "Erabili IMF/Yamaha FB-01 MIDI irteerarako" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -2814,30 +2845,30 @@ msgstr "" "Erabili IBM Music Feature txartela edo Yamaha FB-01 FM " "sintetizatzailemodulua MIDI irteerarako" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "Erabili audio CDa" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "Erabili CD-ko audioa jokokoa beharrean, eskurarri badago" -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "Erabili Windows-eko kurtsoreak" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "" "Erabili Windows-eko kurtsoreak (txikiagoak eta monokromoak) DOS-ekoak " "erabilibeharrean" -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "Erabili zilarrezko kurtsoreak" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" @@ -3509,7 +3540,7 @@ msgstr "Musika: " msgid "Subtitle speed: " msgstr "Azpitit. abiadura:" -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3518,7 +3549,7 @@ msgstr "" "MIDI euskarri natiboak LucasArts-en Roland eguneraketa behar du,\n" "baina %s ez dago eskuragarri. AdLib erabiliko da." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " "files for Maniac Mansion have to be in the 'Maniac' directory inside the " @@ -3553,8 +3584,8 @@ msgid "" "Files button in-game shows original savegame dialog rather than the ScummVM " "menu" msgstr "" -"Jokoko Fitxategiak botoiak jatorrizko jokoa gordetzeko elkarrizketak erakusten " -"ditu, ScummVM-ren elkarrizketak erakutsi beharrean" +"Jokoko Fitxategiak botoiak jatorrizko jokoa gordetzeko elkarrizketak " +"erakusten ditu, ScummVM-ren elkarrizketak erakutsi beharrean" #: engines/sherlock/detection.cpp:81 msgid "Pixellated scene transitions" @@ -3590,8 +3621,8 @@ msgstr "Irristatu elkarrizketak" #: engines/sherlock/detection.cpp:112 msgid "Slide UI dialogs into view, rather than simply showing them immediately" -msgstr "Irristatu UI elkarrizketak pantailara, osorik bat-batean erakutsi " -"beharrean" +msgstr "" +"Irristatu UI elkarrizketak pantailara, osorik bat-batean erakutsi beharrean" #: engines/sherlock/detection.cpp:121 msgid "Transparent windows" @@ -3700,6 +3731,15 @@ msgstr "Erakutsi objektuen etiketak" msgid "Show labels for objects on mouse hover" msgstr "Erakutsi objektuen etiketak sagua pasatzean" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/fi_FI.po b/po/fi_FI.po index a306d8e537..858e15a587 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: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: 2012-12-01 19:37+0200\n" "Last-Translator: Toni Saarela <saarela@gmail.com>\n" "Language-Team: Finnish\n" @@ -215,7 +215,7 @@ msgstr "" #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -506,7 +506,7 @@ msgstr "Valitse kansio pelitallennuksille" msgid "This game ID is already taken. Please choose another one." msgstr "Pelin tunnus on jo kфytіssф. Valitse jokin muu." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "~L~opeta" @@ -594,17 +594,18 @@ msgid "Search:" msgstr "Etsi:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Lataa peli:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Lataa" @@ -1259,7 +1260,7 @@ msgstr "Antialiasoitu renderіijф (16 bpp)" msgid "Antialiased" msgstr "Antialiasoitu (16 bpp)" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Tyhjennф arvo" @@ -1386,17 +1387,17 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "Peli hakemistossa '%s' nфyttфisi olevan tuntematon." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" "Ole hyvф ja ilmoita ScummVM:n kehittфjille seuraavat tiedot, lisфksi kerro" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "" "mikф peli oli kyseessф, ja sen versio, kieli, ja muut vastaavat tiedot." @@ -1405,11 +1406,11 @@ msgstr "" msgid "~R~esume" msgstr "~J~atka" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "~L~ataa" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "~T~allenna" @@ -1438,9 +1439,9 @@ msgstr "Palaa p~e~livalitsimeen" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1455,9 +1456,10 @@ msgstr "Tallenna peli:" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1481,13 +1483,13 @@ msgstr "" "Pelitilan tallennus epфonnistui (%s)! Avaa LUEMINUT tiedosto saadaksesi " "lisфtietoa." -#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 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/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~P~eruuta" @@ -1642,11 +1644,11 @@ msgstr "" msgid "PC-98 Audio" msgstr "Ффni" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "Alustetaan MT-32 emulaattoria" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "MT-32 emulaattori" @@ -1765,12 +1767,12 @@ msgstr "" msgid "Swipe three fingers to the right to toggle." msgstr "" -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 #, fuzzy msgid "OpenGL" msgstr "Avaa" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "" @@ -2333,14 +2335,14 @@ msgstr "Tarkista pфivitykset..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Kфytф alkuperфisiф tallenna/lataa valikkoja" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Kфytф alkuperфisiф tallenna/lataa valikkoja, ScummVM valikoiden sijaan" @@ -2366,11 +2368,29 @@ msgid "" "Enables mouse support. Allows to use mouse for movement and in game menus." msgstr "" +#: engines/agi/detection.cpp:177 +msgid "Use Hercules hires font" +msgstr "" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2380,13 +2400,13 @@ msgstr "Lataa pelitallenne:" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Lataa tallenne" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2397,7 +2417,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2408,7 +2428,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2640,29 +2660,39 @@ msgid "" "\n" msgstr "" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "" + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "~Z~ip moodi valittu" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "Siirtymфt pффllф" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "Pudota sivu" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +#, fuzzy +msgid "Show ~M~ap" msgstr "Nфytф kartta" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +#, fuzzy +msgid "Main Men~u~" msgstr "Pффvalikko" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "Vesiefekti pффllф" @@ -2785,67 +2815,67 @@ msgstr "Vaihtoehtoinen intro" msgid "Use an alternative game intro (CD version only)" msgstr "Kфytф vaihtoehtoista pelin introa (vain CD versiossa)" -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 #, fuzzy msgid "Enable high resolution graphics" msgstr "Kфytф kestopisteissф vфrillisiф grafiikkapalkkeja numeroiden sijaan" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 #, fuzzy msgid "Enable high resolution graphics/content" msgstr "Kфytф kestopisteissф vфrillisiф grafiikkapalkkeja numeroiden sijaan" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Kфytф mieluiten digitaalisia ффnitehosteita." -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "" "Kфytф mieluiten digitaalisia ффnitehosteita synteettisten tehosteiden sijaan." -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "Kфytф IMF/Yamaha FB-01:stф MIDI-musiikille" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" "Kфytф IBM:n Music Feature korttia, tai Yamaha FB-01 FM moduulia MIDIlle" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "Kфytф CD:n ффntф" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "Kфytф CD:n audiota pelin audion sijaan, jos mahdollista." -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "Kфytф Windowsin kursoreita" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "" "Kфytф Windowsin kursoreita (pienempiф ja harmaasфvyisiф) DOS kursorien sijaan" -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "Kфytф hopeisia kursoreita" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "Kфytф vaihtoehtoisia hopeisia kursoreita normaalien kultaisten sijaan" @@ -3520,7 +3550,7 @@ msgstr "Musiikki:" msgid "Subtitle speed: " msgstr "Tekstin nopeus:" -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3529,7 +3559,7 @@ msgstr "" "Suora MIDI tuki vaatii Roland pфivityksen LucasArtsilta, mutta\n" "%s puuttuu. Kфytetффn AdLibia sen sijaan." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 #, fuzzy msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " @@ -3702,6 +3732,15 @@ msgstr "Nфytф esineiden tiedot" msgid "Show labels for objects on mouse hover" msgstr "Nфytф esineiden kuvaus kohdistaessasi kursorin esineen ylle" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/fr_FR.po b/po/fr_FR.po index e223a96a54..7a0ee5ea23 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.8.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: 2016-02-20 23:17+0000\n" "Last-Translator: Thierry Crozat <criezy@scummvm.org>\n" "Language-Team: French <scummvm-devel@lists.sf.net>\n" @@ -211,7 +211,7 @@ msgstr "Remet tous les rщglages р leurs valeurs par dщfaut." #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -502,7 +502,7 @@ msgstr "Sщlectionner le rщpertoire pour les sauvegardes" msgid "This game ID is already taken. Please choose another one." msgstr "Cet ID est dщjр utilisщ par un autre jeu. Choisissez en un autre svp." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "~Q~uitter" @@ -591,17 +591,18 @@ msgid "Search:" msgstr "Filtre :" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Charger le jeu :" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Charger" @@ -1251,7 +1252,7 @@ msgstr "Rendu Anti-crщnelщ" msgid "Antialiased" msgstr "Anti-crщnelщ" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Effacer la valeur" @@ -1378,18 +1379,18 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Ambre" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "Le jeu dans '%s' n'est pas reconnu." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" "Veuillez reporter les informations suivantes р l'щquipe ScummVM ainsi que le " "nom" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "du jeu que vous avez essayщ d'ajouter, sa version, le langage, etc..." @@ -1397,11 +1398,11 @@ msgstr "du jeu que vous avez essayщ d'ajouter, sa version, le langage, etc..." msgid "~R~esume" msgstr "~R~eprendre" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "~C~harger" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "~S~auver" @@ -1430,9 +1431,9 @@ msgstr "Retour au ~L~anceur" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1447,9 +1448,10 @@ msgstr "Sauvegarde :" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1474,13 +1476,13 @@ msgstr "" "Echec de la sauvegarde (%s)! Lisez le fichier README pour les informations " "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/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 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/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~A~nnuler" @@ -1636,11 +1638,11 @@ msgstr "Audio FM Towns" msgid "PC-98 Audio" msgstr "Audio PC-98" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "Initialisation de l'Щmulateur MT-32" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "Щmulateur MT-32" @@ -1757,11 +1759,11 @@ msgstr "Le mode glisser-auto est maintenant" msgid "Swipe three fingers to the right to toggle." msgstr "Glissez trois doigts vers la droite pour changer de mode." -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 msgid "OpenGL" msgstr "OpenGL" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "OpenGL (sans filtre)" @@ -2321,14 +2323,14 @@ msgstr "Recherche des mises р jour..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Dialogues sauvegarde/chargement d'origine" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" @@ -2358,11 +2360,31 @@ msgstr "" "Activer le support de la souris. Cela permet d'utiliser la souris pour les " "mouvements et la navigation dans les menus." +#: engines/agi/detection.cpp:177 +msgid "Use Hercules hires font" +msgstr "Utiliser les polices Hercules haute rщsolution" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "Utilise les polices Hercules haute rщsolution quand elles sont disponibles." + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "Pause lors de la saisie de commandes" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" +"Affiche une fenъtre de saisie de commandes et interrompt le jeu (comme pour les jeux SCI) " +"р la place d'un champ de saisie en temps rщel." + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2372,13 +2394,13 @@ msgstr "Charger le jeu :" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Charger" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2389,7 +2411,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2400,7 +2422,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2647,29 +2669,37 @@ msgstr "" "\n" " \n" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "Jouer la vidщo du survol de Myst" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "La vidщo du survol de Myst n'щtait pas jouщe par le moteur originel." + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "Mode ~Z~ip Activщ" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "T~r~ansitions activщes" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "~L~acher la Page" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" -msgstr "Afficher la Carte" +#: engines/mohawk/dialogs.cpp:103 +msgid "Show ~M~ap" +msgstr "Afficher la ~C~arte" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +msgid "Main Men~u~" msgstr "~M~enu Principal" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "~E~ffets de l'Eau Activщs" @@ -2792,37 +2822,37 @@ msgstr "Intro alternative" msgid "Use an alternative game intro (CD version only)" msgstr "Utiliser une intro alternative (version CD uniquement)" -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "Passer l'щtape de tramage EGA (fonds de couleurs pleines)" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" "Passer l'щtape de tramage dans les jeux EGA ; les images utilisent des " "couleurs pleines" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 msgid "Enable high resolution graphics" msgstr "Utiliser les graphiques haute rщsolution" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 msgid "Enable high resolution graphics/content" msgstr "Utiliser les graphiques haute rщsolution" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Prщfщrer les effets sonores digitaux" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Prщfщrer les effets sonores digitaux plutєt que ceux synthщtisщs" -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "Utiliser IMF/Yamaha FB-01 pour la sortie MIDI" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -2830,32 +2860,32 @@ msgstr "" "Utiliser une carte IBM Music Feature ou un module Yamaha FB-01 FM pour la " "sortie MIDI" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "Utiliser la musique du CD" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "" "Utiliser la musique du CD quand elle est disponible au lieu de la musique du " "jeu" -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "Utiliser les curseurs Windows" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "" "Utiliser les curseurs Windows (plus petits et monochromes) au lieu des " "curseurs DOS" -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "Utiliser les curseurs argentщs" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "Utiliser les curseurs argentщs au lieu des curseurs normaux dorщs" @@ -3525,7 +3555,7 @@ msgstr "Volume Musique :" msgid "Subtitle speed: " msgstr "Vitesse des ST :" -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3534,7 +3564,7 @@ msgstr "" "Support MIDI natif requiшre la mise р jour Roland de LucasArt,\n" "mais %s manque. Utilise AdLib р la place." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " "files for Maniac Mansion have to be in the 'Maniac' directory inside the " @@ -3723,6 +3753,17 @@ msgstr "Afficher la description des objets" msgid "Show labels for objects on mouse hover" msgstr "Afficher la description des objets lors de passage du pointeur" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "Utiliser les voix anglaises" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" +"Utilise les voix anglaises au lieu des voix allemandes pour tous les autres " +"langages" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/gl_ES.po b/po/gl_ES.po index 22b99fe2a7..c5c9bcf3b5 100644 --- a/po/gl_ES.po +++ b/po/gl_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.8.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: 2016-02-21 00:43+0100\n" "Last-Translator: Santiago G. Sanz <s.sanz@uvigo.es>\n" "Language-Team: Santiago G. Sanz <s.sanz@uvigo.es>\n" @@ -211,7 +211,7 @@ msgstr "" #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -501,7 +501,7 @@ msgstr "Selecciona un directorio para ficheiros de gardado" msgid "This game ID is already taken. Please choose another one." msgstr "Este ID de xogo xa estс en uso. Selecciona outro." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "~S~aэr" @@ -589,17 +589,18 @@ msgid "Search:" msgstr "Buscar:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Cargar partida:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Cargar" @@ -1240,7 +1241,7 @@ msgstr "Procesamento antidistorsiѓn" msgid "Antialiased" msgstr "Antidistorsiѓn" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Limpar valor" @@ -1367,16 +1368,16 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules сmbar" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "O xogo de %s semella ser descoёecido." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "Facilita esta informaciѓn ao equipo de ScummVM, xunto co nome" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "do xogo que tentaches engadir, xunto coa versiѓn, lingua, etc.:" @@ -1384,11 +1385,11 @@ msgstr "do xogo que tentaches engadir, xunto coa versiѓn, lingua, etc.:" msgid "~R~esume" msgstr "~R~etomar" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "~C~argar" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "~G~ardar" @@ -1417,9 +1418,9 @@ msgstr "~V~olver ao Iniciador" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1434,9 +1435,10 @@ msgstr "Gardar partida:" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1461,13 +1463,13 @@ msgstr "" "Erro ao gardar (%s)! Consulta o ficheiro README para obter informaciѓn " "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/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 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/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~C~ancelar" @@ -1623,11 +1625,11 @@ msgstr "FM-Towns Audio" msgid "PC-98 Audio" msgstr "PC-98 Audio" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "Iniciando emulador de MT-32" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "Emulador de MT-32" @@ -1744,11 +1746,11 @@ msgstr "O modo Autoarrastrar estс" msgid "Swipe three fingers to the right to toggle." msgstr "Arrastra tres dedos с dereita para cambiar o estado." -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 msgid "OpenGL" msgstr "OpenGL" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "OpenGL (Sen filtraxe)" @@ -2306,14 +2308,14 @@ msgstr "Buscar actualizaciѓns..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Empregar pantallas orixinais de gardado e carga" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" @@ -2342,11 +2344,30 @@ msgstr "" "Activa a compatibilidade co rato. Permite o uso do rato para o movemento e " "os menњs do xogo." +#: engines/agi/detection.cpp:177 +#, fuzzy +msgid "Use Hercules hires font" +msgstr "Hercules verde" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2356,13 +2377,13 @@ msgstr "Restaurar xogo:" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Restaurar" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2373,7 +2394,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2384,7 +2405,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2631,29 +2652,39 @@ msgstr "" "\".\n" "\n" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "" + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "Modo ~C~omprimido activado" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "~T~ransiciѓns activadas" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "~D~eixar folla" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +#, fuzzy +msgid "Show ~M~ap" msgstr "Mo~s~trar mapa" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +#, fuzzy +msgid "Main Men~u~" msgstr "~M~enњ principal" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "Efecto de ~a~uga activado" @@ -2775,37 +2806,37 @@ msgstr "Intro alternativa" msgid "Use an alternative game intro (CD version only)" msgstr "Emprega unha introduciѓn alternativa para o xogo (sѓ versiѓn en CD)." -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "Omitir interpolaciѓn de cores EGA (fondos de cor completa)" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" "Omite a interpolaciѓn de cores EGA. Os grсficos mѓstranse con cores " "completas." -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 msgid "Enable high resolution graphics" msgstr "Activar grсficos de alta resoluciѓn" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 msgid "Enable high resolution graphics/content" msgstr "Activa os grсficos ou o contido de alta resoluciѓn." -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Preferir efectos de son dixitais" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Dс preferencia aos efectos de son dixitais no canto dos sintщticos." -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "Empregar IMF/Yamaha FB-01 para a saэda de MIDI" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -2813,30 +2844,30 @@ msgstr "" "Emprega unha tarxeta IBM Music Feature ou un mѓdulo de sintetizador Yamaha " "FB-01 FM para a saэda de MIDI." -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "Empregar son de CD" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "Emprega son de CD no canto do do xogo, de ser o caso." -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "Empregar cursores de Windows" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "" "Emprega os cursores de Windows (mсis pequenos e monocromos) no canto dos de " "DOS." -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "Empregar cursores prateados" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" @@ -3508,7 +3539,7 @@ msgstr "Volume de mњsica:" msgid "Subtitle speed: " msgstr "Velocidade dos subtэtulos:" -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3517,7 +3548,7 @@ msgstr "" "A compatibilidade nativa con MIDI precisa a actualizaciѓn de Roland\n" "de LucasArts, mais falla %s. Empregarase AdLib." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " "files for Maniac Mansion have to be in the 'Maniac' directory inside the " @@ -3700,6 +3731,15 @@ msgstr "Mostrar etiquetas" msgid "Show labels for objects on mouse hover" msgstr "Mostra as etiquetas dos obxectos ao apuntar co rato." +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/hu_HU.po b/po/hu_HU.po index 02878f4fbc..bd1f8ab112 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2016-02-20 21:22+0000\n" -"PO-Revision-Date: 2016-02-21 06:24+0200\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" +"PO-Revision-Date: 2016-04-02 07:37+0200\n" "Last-Translator: George Kormendi <grubycza@hotmail.com>\n" "Language-Team: Hungarian\n" "Language: Magyar\n" @@ -211,7 +211,7 @@ msgstr "Minden FluidSynth beсllэtсs alapщrtelmezett щrtщkre." #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -500,7 +500,7 @@ msgstr "Vсlaszz jсtщkmentщseknek mappсt" msgid "This game ID is already taken. Please choose another one." msgstr "Ez a jсtщkazonosэtѓ ID mсr foglalt, Vсlassz egy mсsikat." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "Kilщpщs" @@ -588,17 +588,18 @@ msgid "Search:" msgstr "Keresщs:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Jсtщk betіltщse:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Betіltщs" @@ -1236,7 +1237,7 @@ msgstr "Щlsimэtсsos lekщpezѕ" msgid "Antialiased" msgstr "Щlsimэtott" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Щrtщk tіrlщse" @@ -1363,16 +1364,16 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Sсrga" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "A '%s' jсtщk ismeretlennek tћnik." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "Kщrlek jelezd a ScummVM csapatnak a kіvetkezѕ adatokat, egyќtt a jсtщk" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "cэmщvel щs megbэzhatѓ adataival jсtщkverziѓ/nyelv(ek)/stb.:" @@ -1380,11 +1381,11 @@ msgstr "cэmщvel щs megbэzhatѓ adataival jсtщkverziѓ/nyelv(ek)/stb.:" msgid "~R~esume" msgstr "Folytatсs" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "~B~etіltщs" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "Mentщs" @@ -1413,9 +1414,9 @@ msgstr "Visszatщrщs az indэtѓba" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1430,9 +1431,10 @@ msgstr "Jсtщk mentщse:" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1456,13 +1458,13 @@ msgstr "" "(%s) jсtщkmentщs nem sikerќlt!. Olvassd el a README-t az alap " "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/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 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/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~M~щgse" @@ -1616,11 +1618,11 @@ msgstr "FM-Towns Hang" msgid "PC-98 Audio" msgstr "PC-98 Hang" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "MT-32 Emulсtor inicializсlсsa" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "MT-32 Emulсtor" @@ -1737,11 +1739,11 @@ msgstr "Auto-hњz mѓdban van" msgid "Swipe three fingers to the right to toggle." msgstr "мsd hсrom њjjal hogy biztosan vсltson." -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 msgid "OpenGL" msgstr "OpenGL" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "OpenGL (Nincs szћrщs)" @@ -2297,14 +2299,14 @@ msgstr "Frissэtщsek keresщse..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Eredeti ment/tіlt kщpernyѕk hasznсlata" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 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" @@ -2332,11 +2334,31 @@ msgstr "" "Egщrmѓd engщlyezve. Lehetѕvщ teszi az egщrrel mozgatсst jсtщkban щs " "jсtщkmenќkben." +#: engines/agi/detection.cpp:177 +msgid "Use Hercules hires font" +msgstr "Hercules hires font hasznсlata" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "Hercules hires font hasznсlata, ha a font fсjl elщrhetѕ." + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "Szќnet a parancsok beэrсsakor" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" +"Parancssor ablak megjelenэtщse щs jсtщk szќneteltetщse (mint a SCI) valѓs " +"idejќ parancs helyett." + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2346,13 +2368,13 @@ msgstr "Jсtщkmenet visszaсllэtсsa:" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Visszaсllэtсs" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2363,7 +2385,7 @@ msgstr "" "\n" "%s fсjlbѓl nem sikerќlt" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2374,7 +2396,7 @@ msgstr "" "\n" "%s fсjlba nem sikerќlt" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2619,29 +2641,37 @@ msgstr "" "utasэtсst.\n" "\n" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "Myst bevezetѕ film lejсtszсsa" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "A Myst bevezetѕ filmet nem jсtszotta le az eredeti motor." + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "~Z~ip Mѓd aktivсlva" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "~С~tmenetek engedщlyezve" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "Oldal~D~obсs" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" -msgstr "~S~ Tщrkщp" +#: engines/mohawk/dialogs.cpp:103 +msgid "Show ~M~ap" +msgstr "~M~ Tщrkщp nщzet" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" -msgstr "Fѕ~M~enќ" +#: engines/mohawk/dialogs.cpp:109 +msgid "Main Men~u~" +msgstr "Fѕ Menќ ~u~" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "Vэzeffektus engedщlyezve" @@ -2763,36 +2793,36 @@ 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)" -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "EGA szэnmodulсciѓ сtugrсsa (Szэnes hсttereknщl)" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" "Szэnmodulсciѓ сtugrсsa EGA jсtщkoknсl, grafikсk teljes szэnben lсthatѓk" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 msgid "Enable high resolution graphics" msgstr "Nagy felbontсsњ grafika engedщlyezщse" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 msgid "Enable high resolution graphics/content" msgstr "Nagy felbontсsњ grafika/tartalom engedщlyezщse" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Digitсlis hangeffektusok elѕnyben" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Digitсlis hanghatсsok elѕnyben a szintetizсltakkal szemben" -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "IMF/Yamaha FB-01 hasznсlata MIDI kimentre" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -2800,28 +2830,28 @@ msgstr "" "IBM Music Feature kсrtya vagy Yamaha FB-01 FM szintetizсtor modul hasznсlata " "MIDI kimenetre" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "CD audiѓ hasznсlata" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "CD audiѓ hasznсlata a jсtщkban lщvѕvel szemben, ha elщrhetѕ" -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "Windows kurzorok hasznсlata" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "Windows kurzorok hasznсlata (kisebb щs monokrѓm) a DOS-osok helyett " -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "Ezќst kurzor hasznсlata" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "Alternatэv ezќst kurzorszett hasznсlata, a normсl arany helyett" @@ -3491,7 +3521,7 @@ msgstr "Zene hangereje:" msgid "Subtitle speed: " msgstr "Felirat sebessщg:" -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3500,7 +3530,7 @@ msgstr "" "Native MIDI tсmogatсshoz kell a Roland Upgrade a LucasArts-tѓl,\n" "a %s hiсnyzik. AdLib-ot hasznсlok helyette." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " "files for Maniac Mansion have to be in the 'Maniac' directory inside the " @@ -3682,6 +3712,16 @@ msgstr "Tсrgycimke lсthatѓ" msgid "Show labels for objects on mouse hover" msgstr "Tсrgycimke lсthatѓ ha az egщr felette van" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "Angol beszщd hasznсlata" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" +"Angol beszщd hasznсlata a Nщmet helyett minden nyelven, a Nщmeten kэvќl" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/it_IT.po b/po/it_IT.po index 880c0ca7df..762ed12ccb 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: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: 2014-07-03 17:59-0600\n" "Last-Translator: Matteo 'Maff' Angelino <matteo.maff at gmail dot com>\n" "Language-Team: Italian\n" @@ -211,7 +211,7 @@ msgstr "" #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -502,7 +502,7 @@ msgstr "Seleziona la cartella dei salvataggi" msgid "This game ID is already taken. Please choose another one." msgstr "Questo ID di gioco ш giр in uso. Si prega di sceglierne un'altro." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "C~h~iudi" @@ -590,17 +590,18 @@ msgid "Search:" msgstr "Cerca:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Carica gioco:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Carica" @@ -1251,7 +1252,7 @@ msgstr "Renderer con antialiasing" msgid "Antialiased" msgstr "Con antialiasing" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Cancella" @@ -1379,16 +1380,16 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules ambra" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "Il gioco in '%s' sembra essere sconosciuto." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "Per favore, riporta i seguenti dati al team di ScummVM con il nome" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "del gioco che hai provato ad aggiungere e la sua versione/lingua/ecc.:" @@ -1396,11 +1397,11 @@ msgstr "del gioco che hai provato ad aggiungere e la sua versione/lingua/ecc.:" msgid "~R~esume" msgstr "~R~ipristina" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "~C~arica" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "~S~alva" @@ -1429,9 +1430,9 @@ msgstr "~V~ai a elenco giochi" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1446,9 +1447,10 @@ msgstr "Salva gioco:" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1474,13 +1476,13 @@ msgstr "" "informazioni di base e per le istruzioni su come ottenere ulteriore " "assistenza." -#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 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/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~A~nnulla" @@ -1639,11 +1641,11 @@ msgstr "Emulatore FM Towns" msgid "PC-98 Audio" msgstr "Audio" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "Avvio in corso dell'emulatore MT-32" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "Emulatore MT-32" @@ -1761,11 +1763,11 @@ msgstr "" msgid "Swipe three fingers to the right to toggle." msgstr "" -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 msgid "OpenGL" msgstr "OpenGL" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "OpenGL (senza filtri)" @@ -2324,14 +2326,14 @@ msgstr "Cerca aggiornamenti..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Usa schermate di salvataggio originali" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" @@ -2359,11 +2361,30 @@ msgid "" "Enables mouse support. Allows to use mouse for movement and in game menus." msgstr "" +#: engines/agi/detection.cpp:177 +#, fuzzy +msgid "Use Hercules hires font" +msgstr "Hercules verde" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2373,13 +2394,13 @@ msgstr "Ripristina gioco:" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Ripristina" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2390,7 +2411,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2401,7 +2422,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2635,29 +2656,39 @@ msgid "" "\n" msgstr "" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "" + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "Modalitр ~Z~ip attivata" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "~T~ransizioni attive" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "~L~ascia pagina" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +#, fuzzy +msgid "Show ~M~ap" msgstr "~M~ostra mappa" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +#, fuzzy +msgid "Main Men~u~" msgstr "~M~enu principale" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "~E~ffetto acqua attivo" @@ -2781,37 +2812,37 @@ msgstr "Intro alternativa" msgid "Use an alternative game intro (CD version only)" msgstr "Usa un'intro del gioco alternativa (solo versione CD)" -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 #, fuzzy msgid "Enable high resolution graphics" msgstr "Attiva le barre di Hit Point" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 #, fuzzy msgid "Enable high resolution graphics/content" msgstr "Attiva le barre di Hit Point" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Scegli effetti sonori digitali" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Scegli gli effetti sonori digitali al posto di quelli sintetizzati" -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "Usa IMF/Yamaha FB-01 per output MIDI" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -2819,30 +2850,30 @@ msgstr "" "Usa una scheda IBM Music Feature o un modulo synth Yamaha FB-01 FM per " "l'output MIDI" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "Usa audio da CD" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "" "Usa l'audio da CD al posto di quello incorporato nel gioco, se disponibile" -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "Usa cursori di Windows" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "" "Usa i cursori di Windows (piљ piccoli e monocromatici) al posto di quelli DOS" -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "Usa cursori d'argento" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" @@ -3519,7 +3550,7 @@ msgstr "Volume musica:" msgid "Subtitle speed: " msgstr "Velocitр testo:" -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3528,7 +3559,7 @@ msgstr "" "Il supporto nativo MIDI richiede il Roland Upgrade della LucasArts,\n" "ma %s non ш presente. Verrр usato AdLib." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 #, fuzzy msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " @@ -3708,6 +3739,15 @@ msgstr "Mostra etichette oggetti" msgid "Show labels for objects on mouse hover" msgstr "Mostra etichette per gli oggetti al passaggio del mouse" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/nb_NO.po b/po/nb_NO.po index 8f105c6d55..21e3e9f45c 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: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: 2016-02-25 23:42+0100\n" "Last-Translator: Einar Johan Trјan Sјmхen <einarjohants@gmail.com>\n" "Language-Team: somaen <einarjohants@gmail.com>\n" @@ -212,7 +212,7 @@ msgstr "Nullstill alle FluidSynth-instillinger til standardverdier" #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -503,7 +503,7 @@ msgstr "Velg mappe for lagrede spill" msgid "This game ID is already taken. Please choose another one." msgstr "Denne spill-IDen er allerede i bruk. Vennligst velg en annen." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "~A~vslutt" @@ -591,17 +591,18 @@ msgid "Search:" msgstr "Sјk:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Хpne spill:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Хpne" @@ -1241,7 +1242,7 @@ msgstr "Kantutjevnet tegner" msgid "Antialiased" msgstr "Kantutjevnet" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Tјm verdi" @@ -1368,17 +1369,17 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Oransje" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "Spillet i '%s' ser ut til х vцre ukjent." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" "Vennligst rapporter de fјlgende dataene til ScummVM-teamet sammen med navnet" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "pх spillet du forsјkte х legge til, og dets versjon/sprхk/etc.:" @@ -1386,11 +1387,11 @@ msgstr "pх spillet du forsјkte х legge til, og dets versjon/sprхk/etc.:" msgid "~R~esume" msgstr "~F~ortsett" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "~Х~pne" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "~L~agre" @@ -1419,9 +1420,9 @@ msgstr "~T~ilbake til oppstarter" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1436,9 +1437,10 @@ msgstr "Lagret spill:" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1463,13 +1465,13 @@ msgstr "" "Lagring av spilltilstand feilet (%s)! Vennligst konsulter README-filen for " "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/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 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/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~A~vbryt" @@ -1625,11 +1627,11 @@ msgstr "FM Towns Lyd" msgid "PC-98 Audio" msgstr "PC-98 Lyd" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "Initialiserer MT-32-Emulator" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "MT-32 Emulator" @@ -1746,11 +1748,11 @@ msgstr "Auto-dramodus er nх" msgid "Swipe three fingers to the right to toggle." msgstr "Sveip tre fingre til hјyre for х veksle" -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 msgid "OpenGL" msgstr "OpenGL" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "OpenGL (Ingen filtrering)" @@ -2309,14 +2311,14 @@ msgstr "Sjekk for oppdateringer..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Bruk originale lagre/laste-skjermer" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Bruk de originale lagre/laste-skjermene, istedenfor ScummVM-variantene" @@ -2343,11 +2345,30 @@ msgid "" msgstr "" "Aktiver musstјtte. Tillater х bruke mus for bevegelse og i spillmenyer." +#: engines/agi/detection.cpp:177 +#, fuzzy +msgid "Use Hercules hires font" +msgstr "Hercules Grјnn" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2357,13 +2378,13 @@ msgstr "Gjennopprett spill:" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Gjenopprett" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2374,7 +2395,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2385,7 +2406,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2630,29 +2651,39 @@ msgstr "" "ScummVM debugkonsollen og bruke kommandoen Ћimport_savefileЛ\n" "\n" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "" + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "~Z~ipmodus aktivert" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "~O~verganger aktivert" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "~D~ropp Side" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +#, fuzzy +msgid "Show ~M~ap" msgstr "Vi~s~ Kart" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +#, fuzzy +msgid "Main Men~u~" msgstr "Hoved~m~eny" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "~V~anneffekt aktivert" @@ -2774,35 +2805,35 @@ msgstr "Alternativ intro" msgid "Use an alternative game intro (CD version only)" msgstr "Bruk en alternativ intro (Kun for CD-versjon)" -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "Hopp over EGA dithering (fullfarge bakgrunner)" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 msgid "Enable high resolution graphics" msgstr "Aktiver hјyopplјselig grafikk" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 msgid "Enable high resolution graphics/content" msgstr "Aktiver hјyopplјselig grafikk/innhold" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Foretrekk digitale lydeffekter" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Foretrekk digitale lydeffekter fremfor syntetiske" -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "Bruk IMF/Yamaha-FB-01 for MIDI-output" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -2810,28 +2841,28 @@ msgstr "" "Bruk et IBM Music Feature-kort eller en Yamaha FB-01 FM-synthmodul til MIDI " "output" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "Bruk CD-lyd" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "Bruk CD-lyd istedenfor spillets lyd, hvis tilgjengelig" -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "Bruk Windows-muspekere" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "Bruk Windows-muspekerene (mindre, og monokrome) isteden" -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "Bruk sјlvmuspekere" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" @@ -3502,7 +3533,7 @@ msgstr "Musikkvolum: " msgid "Subtitle speed: " msgstr "Teksthastighet: " -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3511,7 +3542,7 @@ msgstr "" "Ekte MIDI-stјtte krever ЋRoland UpgradeЛ fra LucasArts,\n" "men %s mangler. Bruker AdLib istedet." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " "files for Maniac Mansion have to be in the 'Maniac' directory inside the " @@ -3688,6 +3719,15 @@ msgstr "Vis objektmerkelapper" msgid "Show labels for objects on mouse hover" msgstr "Vis merkelapper for objekter nхr musa stхr over dem" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/nl_NL.po b/po/nl_NL.po index 99d1400b04..4d850d4e40 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: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: 2016-02-21 13:05+0100\n" "Last-Translator: Ben Castricum <scummvm@bencastricum.nl>\n" "Language-Team: Ben Castricum <scummvm@bencastricum.nl>\n" @@ -212,7 +212,7 @@ msgstr "Alle FluidSynth instellingen terugzetten naar de standaard waarden." #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -504,7 +504,7 @@ msgstr "Selecteer map voor opgeslagen spellen" msgid "This game ID is already taken. Please choose another one." msgstr "Dit spel-ID is al in gebruik. Kies a.u.b. een andere." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "~S~toppen" @@ -594,17 +594,18 @@ msgid "Search:" msgstr "Zoeken:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Laad spel:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Laden" @@ -1252,7 +1253,7 @@ msgstr "Antialiased Renderer" msgid "Antialiased" msgstr "Antialiased" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Veld leegmaken" @@ -1380,17 +1381,17 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Amber" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "Het spel in '%s' lijkt onbekend te zijn." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" "Raporteer a.u.b. de volgende gegevens aan het ScummVM team samen met de naam" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "van het spel die u probeerde toe te voegen, en haar versie/taal/etc.:" @@ -1398,11 +1399,11 @@ msgstr "van het spel die u probeerde toe te voegen, en haar versie/taal/etc.:" msgid "~R~esume" msgstr "~H~ervatten" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "~L~aden" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "Op~s~laan" @@ -1431,9 +1432,9 @@ msgstr "S~t~artmenu" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1448,9 +1449,10 @@ msgstr "Spel opslaan:" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1476,13 +1478,13 @@ msgstr "" "basisinformatie, en voor instructies voor het verkrijgen van verdere " "assistentie." -#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 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/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~A~nnuleer" @@ -1640,11 +1642,11 @@ msgstr "FM-Towns Geluid" msgid "PC-98 Audio" msgstr "PC-98 Geluid" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "MT-32 Emulator initialiseren" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "MT-32 Emulator" @@ -1761,11 +1763,11 @@ msgstr "Auto-sleep modus is nu" msgid "Swipe three fingers to the right to toggle." msgstr "Swipe drie vingers naar rechts om te schakelen." -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 msgid "OpenGL" msgstr "OpenGL" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "OpenGL (geen filters)" @@ -2325,14 +2327,14 @@ msgstr "Controleren op updates..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Gebruik originele opslaan/laad schermen" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" @@ -2361,11 +2363,30 @@ msgstr "" "Zet muis ondersteuning aan. Maakt het mogelijk om de muis te gebruiken voor " "bewegen en in spelmenus." +#: engines/agi/detection.cpp:177 +#, fuzzy +msgid "Use Hercules hires font" +msgstr "Hercules Groen" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2375,13 +2396,13 @@ msgstr "Laad opgeslagen spel:" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Laad" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2392,7 +2413,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2403,7 +2424,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2649,29 +2670,39 @@ msgstr "" "gebruiken.\n" "\n" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "" + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "~Z~ip Modus Aangezet" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "~O~vergangen Aangezet" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "Laat Pagina ~V~allen" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +#, fuzzy +msgid "Show ~M~ap" msgstr "~T~oon Map" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +#, fuzzy +msgid "Main Men~u~" msgstr "~H~oofdmenu" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "~W~ater Effect Aangezet" @@ -2796,37 +2827,37 @@ msgid "Use an alternative game intro (CD version only)" msgstr "" "Gebruik een alternatieve versie van de intro (alleen voor de CD versie)" -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "Sla EGA dithering stap over (volledige kleuren achtergronden)" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" "Sla dithering stap in EGA spellen over, beelden worden getoond met volledige " "kleuren" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 msgid "Enable high resolution graphics" msgstr "Gebruik hoge resolutie beelden" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 msgid "Enable high resolution graphics/content" msgstr "Gebruik hoge resolutie beelden" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Geef de voorkeur aan digitale geluidseffecten" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Geef de voorkeur aan digitale geluidseffecten boven gesynthetiseerde" -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "Gebruik IMF/Yamaha FB-01 voor MIDI" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -2834,30 +2865,30 @@ msgstr "" "Gebruik een IBM Music Feature kaart of eem Yamaha FB-01 FM synth module voor " "MIDI" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "Gebruik CD audio" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "Gebruik CD audio in plaats van in-game audio, als dat beschikbaar is." -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "Gebruik Windows muisaanwijzers" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "" "Gebruik Windows muisaanwijzers (kleiner en monochrome) in plaats van de DOS " "muisaanwijzers" -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "Gebruik zilveren muisaanwijzers" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" @@ -3529,7 +3560,7 @@ msgstr "Muziek volume:" msgid "Subtitle speed: " msgstr "Snelheid ondertitels:" -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3538,7 +3569,7 @@ msgstr "" "Voor MIDI support is de Roland Upgrade van Lucasarts vereist,\n" "maar %s ontbreekt. Er wordt nu AdLib gebruikt." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " "files for Maniac Mansion have to be in the 'Maniac' directory inside the " @@ -3719,6 +3750,15 @@ msgstr "Toon objectnamen" msgid "Show labels for objects on mouse hover" msgstr "Toon labels voor objecten als de muis er over zweeft" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/nn_NO.po b/po/nn_NO.po index 62f7c07beb..d216f1e3f4 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: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: 2016-02-26 00:37+0100\n" "Last-Translator: Einar Johan TrУИan SУИmУЅen <einarjohants@gmail.com>\n" "Language-Team: somaen <einarjohants@gmail.com>\n" @@ -212,7 +212,7 @@ msgstr "Nullstill alle FluidSynth-instillingar til standardverdiar" #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -503,7 +503,7 @@ msgstr "Vel mappe for lagra spel" msgid "This game ID is already taken. Please choose another one." msgstr "Denne spel-IDen er allerede teken. Vцr vennleg og vel ein anna." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "~A~vslutt" @@ -591,17 +591,18 @@ msgid "Search:" msgstr "Sјk:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Хpne spel:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Хpne" @@ -1237,7 +1238,7 @@ msgstr "Kantutjevna teiknar" msgid "Antialiased" msgstr "Kantutjevna" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Tјm verdi" @@ -1364,17 +1365,17 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Raudgul" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "Spelet i '%s' ser ut til х vere ukjend." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" "Vennlegst rapporter fјlgjande data til ScummVM-teamet, saman med namnet" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "pх spelet du prјvde х leggje til, samt versjon/sprхk/etc.:" @@ -1382,11 +1383,11 @@ msgstr "pх spelet du prјvde х leggje til, samt versjon/sprхk/etc.:" msgid "~R~esume" msgstr "~F~ortsett" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "~Х~pne" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "~L~agre" @@ -1415,9 +1416,9 @@ msgstr "Tilbake til Oppsta~r~tar" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1432,9 +1433,10 @@ msgstr "Lagra spel:" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1460,13 +1462,13 @@ msgstr "" "grunnlegjande informasjon, og for instruskjonar om korleis du kan fх " "ytterlegare hjelp." -#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 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/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~A~vbryt" @@ -1618,11 +1620,11 @@ msgstr "FM-Towns Lyd" msgid "PC-98 Audio" msgstr "PC-98 Lyd" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "Initialiserar MT-32 Emulator" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "MT-32 Emulator" @@ -1739,11 +1741,11 @@ msgstr "" msgid "Swipe three fingers to the right to toggle." msgstr "Sveip tre fingre til hјgre for х veksle" -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 msgid "OpenGL" msgstr "OpenGL" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "OpenGL (Ingen filtrering)" @@ -2300,14 +2302,14 @@ msgstr "SJх etter oppdateringar..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Nytt opprinnelege skjermar for lagring/lasting" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" @@ -2331,11 +2333,30 @@ msgid "" "Enables mouse support. Allows to use mouse for movement and in game menus." msgstr "" +#: engines/agi/detection.cpp:177 +#, fuzzy +msgid "Use Hercules hires font" +msgstr "Hercules Grјnn" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2345,13 +2366,13 @@ msgstr "Gjenopprett spel:" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Gjenopprett" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2359,7 +2380,7 @@ msgid "" "%s" msgstr "" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2367,7 +2388,7 @@ msgid "" "%s" msgstr "" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2592,29 +2613,39 @@ msgid "" "\n" msgstr "" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "" + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "~Z~ipmodus aktivert" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "~O~vergangar aktivert" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +#, fuzzy +msgid "Show ~M~ap" msgstr "~S~yn Kart" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +#, fuzzy +msgid "Main Men~u~" msgstr "Hoved~m~eny" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "~V~anneffekt aktivert" @@ -2725,35 +2756,35 @@ msgstr "Alternativ intro" msgid "Use an alternative game intro (CD version only)" msgstr "Nytt alternativ spillхpning (Kun CD-versjon)" -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 msgid "Enable high resolution graphics" msgstr "Nytt hјgopplјyseleg grafikk" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 msgid "Enable high resolution graphics/content" msgstr "Nytt hјgopplјyseleg grafikk/innhald" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Foretrekk digitale lydeffekter" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "" -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "Nytt IMF/Yamaha FB-01 til MIDI-output" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -2761,28 +2792,28 @@ msgstr "" "Nytt eit IBM Music Feature-kort eller ein Yamaha FB-01 FM synth modul for " "MIDI avspeling" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "Nytt CD-lyd" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "Nytt CD-lyd istaden for spellyd, om den er tilgjengeleg" -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "Nytt Windospeikarar" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "Nytt windowspeikarane (mindre og monokrome) istaden for DOS-peikarane" -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "Nytt sјlvpeikarar" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "Nytt det alternative settet med sјlvpeikarar, istaden for dei gylne" @@ -3452,14 +3483,14 @@ msgstr "Musikkvolum:" msgid "Subtitle speed: " msgstr "Subtitle speed: " -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" "but %s is missing. Using AdLib instead." msgstr "" -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " "files for Maniac Mansion have to be in the 'Maniac' directory inside the " @@ -3631,6 +3662,15 @@ msgstr "Syn objektmerkelappar" msgid "Show labels for objects on mouse hover" msgstr "Syn merkelappar for objekt nхr musa er over dei" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/pl_PL.po b/po/pl_PL.po index 6546259ade..4b8f45c6ec 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: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: 2016-02-20 23:43+0100\n" "Last-Translator: MichaГ ZiБbkowski <mziab@o2.pl>\n" "Language-Team: Grajpopolsku.pl <grajpopolsku@gmail.com>\n" @@ -215,7 +215,7 @@ msgstr "Przywrѓц domyЖlne wartoЖci wszystkich ustawieё FluidSynth." #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -504,7 +504,7 @@ msgstr "Wybierz katalog dla zapisѓw" msgid "This game ID is already taken. Please choose another one." msgstr "Identyfikator jest juП zajъty. Wybierz inny." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "~Z~akoёcz" @@ -592,17 +592,18 @@ msgid "Search:" msgstr "Szukaj" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Wczytaj grъ:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Wczytaj" @@ -1241,7 +1242,7 @@ msgstr "WygГadzany renderer" msgid "Antialiased" msgstr "WygГadzany" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "WyczyЖц" @@ -1368,16 +1369,16 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Bursztynowy Hercules" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "Gra w '%s' wyglБda na nieznanБ." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "PrzekaП poniПsze dane zespoГowi ScummVM razem z nazwБ" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "gry, ktѓrБ prѓbowaГeЖ dodaц oraz jej wersjБ, jъzykiem itd.:" @@ -1385,11 +1386,11 @@ msgstr "gry, ktѓrБ prѓbowaГeЖ dodaц oraz jej wersjБ, jъzykiem itd.:" msgid "~R~esume" msgstr "~W~znѓw" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "~W~czytaj" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "~Z~apisz" @@ -1418,9 +1419,9 @@ msgstr "~P~owrѓt do launchera" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1435,9 +1436,10 @@ msgstr "Zapis:" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1462,13 +1464,13 @@ msgstr "" "Zapis stanu gry nie powiѓdГ siъ (%s)! Aby uzyskaц podstawowe informacje oraz " "dowiedzieц jak szukaц dalszej pomocy, sprawdМ plik README." -#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 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/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~A~nuluj" @@ -1620,11 +1622,11 @@ msgstr "DМwiъk FM-Towns" msgid "PC-98 Audio" msgstr "DМwiъk PC-98" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "Inicjalizacja emulatora MT-32" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "Emulator MT-32" @@ -1741,11 +1743,11 @@ msgstr "Tryb automatycznego przeciБgania jest" msgid "Swipe three fingers to the right to toggle." msgstr "Przesuё trzema palcami, Пeby zmieniц." -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 msgid "OpenGL" msgstr "OpenGL" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "OpenGL (bez filtrowania)" @@ -2301,14 +2303,14 @@ msgstr "SprawdМ aktualizacjъ..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "UПyj oryginalnych ekranѓw odczytu/zapisu" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "UПyj oryginalnych ekranѓw odczytu/zapisu zamiast tych ze ScummVM" @@ -2336,11 +2338,30 @@ msgstr "" "WГБcza obsГugъ myszki. Pozwala na uПycie myszki do przemieszczania i w menu " "gry." +#: engines/agi/detection.cpp:177 +#, fuzzy +msgid "Use Hercules hires font" +msgstr "Zielony Hercules" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2350,13 +2371,13 @@ msgstr "Wznѓw grъ:" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Wznѓw" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2367,7 +2388,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2378,7 +2399,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2621,29 +2642,39 @@ msgstr "" "debugowania ScummVM i uПyц komendy 'import_savefile'.\n" "\n" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "" + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "~T~ryb turbo aktywny" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "~P~rzejЖcia wГБczone" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "~O~puЖц stronъ" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +#, fuzzy +msgid "Show ~M~ap" msgstr "~P~okaП mapъ" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +#, fuzzy +msgid "Main Men~u~" msgstr "~M~enu gГѓwne" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "~E~fekty wody wГБczone" @@ -2764,36 +2795,36 @@ msgstr "Alternatywne intro" msgid "Use an alternative game intro (CD version only)" msgstr "UПyj alternatywnego intra (tylko dla wersji CD)" -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "Pomiё dithering EGA (tГa w peГnym kolorze)" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" "Pomiё dithering w grach EGA, grafika bъdzie wyЖwietlana w peГnym kolorze" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 msgid "Enable high resolution graphics" msgstr "WГБcz grafikъ wysokiej rozdzielczoЖci" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 msgid "Enable high resolution graphics/content" msgstr "WГБcz grafikъ/zawartoЖц wysokiej rozdzielczoЖci" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Preferuj cyfrowe efekty dМwiъkowe" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Preferuj cyfrowe efekty dМwiъkowe zamiast syntezowanych" -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "UПyj IMF/Yamaha FB-01 dla wyjЖcia MIDI" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -2801,29 +2832,29 @@ msgstr "" "UПyj karty IBM Music Feature lub moduГu syntezy FM Yamaha FB-01 dla wyjЖcia " "MIDI" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "UПyj CD audio" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "UПyj CD audio zamiast muzyki w grze, jeЖli jest dostъpne" -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "UПyj windowsowych kursorѓw" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "" "UПyj windowsowych kursorѓw (mniejsze i monochromatyczne) zamiast DOS-owych" -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "UПyj srebrnych kursorѓw" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" @@ -3494,7 +3525,7 @@ msgstr "GГoЖnoЖц muzyki: " msgid "Subtitle speed: " msgstr "Prъd. napisѓw: " -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3503,7 +3534,7 @@ msgstr "" "Natywne wsparcie MIDI wymaga aktualizacji Rolanda od LucasArts,\n" "ale brakuje %s. PrzeГБczam na tryb AdLib." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " "files for Maniac Mansion have to be in the 'Maniac' directory inside the " @@ -3688,6 +3719,15 @@ msgstr "PokaП etykiety obiektѓw" msgid "Show labels for objects on mouse hover" msgstr "PokaП etykiety obiektѓw przy najechaniu myszkБ" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/pt_BR.po b/po/pt_BR.po index b42ccf2bff..61cc0b9376 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: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: 2011-10-21 21:30-0300\n" "Last-Translator: Saulo Benigno <saulobenigno@gmail.com>\n" "Language-Team: ScummBR (www.scummbr.com) <scummbr@yahoo.com.br>\n" @@ -218,7 +218,7 @@ msgstr "" #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -509,7 +509,7 @@ msgstr "Selecione a pasta para os jogos salvos" msgid "This game ID is already taken. Please choose another one." msgstr "Este cѓdigo jс esta sendo utilizado. Por favor, escolha outro." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "~S~air" @@ -598,17 +598,18 @@ msgid "Search:" msgstr "Pesquisar:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Carregar jogo:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Carregar" @@ -1268,7 +1269,7 @@ msgstr "Renderizador Anti-Serrilhamento (16bpp)" msgid "Antialiased" msgstr "Anti-Serrilhamento (16bpp)" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Limpar valor" @@ -1397,17 +1398,17 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Amber" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "O jogo em '% s' parece ser desconhecido." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" "Por favor, informe os seguintes dados para a equipe ScummVM junto com o nome" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "do jogo que vocъ tentou adicionar e sua versуo/idioma/etc.:" @@ -1415,11 +1416,11 @@ msgstr "do jogo que vocъ tentou adicionar e sua versуo/idioma/etc.:" msgid "~R~esume" msgstr "~V~oltar ao jogo" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "~C~arregar" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "~S~alvar" @@ -1448,9 +1449,9 @@ msgstr "~V~oltar ao menu" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1465,9 +1466,10 @@ msgstr "Salvar jogo:" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1493,13 +1495,13 @@ msgstr "" "Por favor, consulte o README para obter informaчѕes bсsicas, e para obter " "instruчѕes sobre como obter assistъncia adicional." -#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 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/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~C~ancelar" @@ -1658,11 +1660,11 @@ msgstr "Emulador FM Towns" msgid "PC-98 Audio" msgstr "Сudio" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "Inicializando Emulador MT-32" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "Emulador MT-32" @@ -1781,12 +1783,12 @@ msgstr "" msgid "Swipe three fingers to the right to toggle." msgstr "" -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 #, fuzzy msgid "OpenGL" msgstr "Abrir" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "" @@ -2348,14 +2350,14 @@ msgstr "Procurar por Atualizaчѕes..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" @@ -2379,11 +2381,30 @@ msgid "" "Enables mouse support. Allows to use mouse for movement and in game menus." msgstr "" +#: engines/agi/detection.cpp:177 +#, fuzzy +msgid "Use Hercules hires font" +msgstr "Hercules Green" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2393,13 +2414,13 @@ msgstr "Restaurar jogo:" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Restaurar" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2410,7 +2431,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2421,7 +2442,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2672,29 +2693,39 @@ msgid "" "\n" msgstr "" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "" + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "Modo ~Z~ip ativado" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "Modo ~T~ransiчѕes ativado" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "~S~oltar Pсgina" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +#, fuzzy +msgid "Show ~M~ap" msgstr "~E~xibir Mapa" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +#, fuzzy +msgid "Main Men~u~" msgstr "~M~enu Principal ScummVM" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "Modo ~E~feitos de сgua ativado" @@ -2819,64 +2850,64 @@ msgstr "" msgid "Use an alternative game intro (CD version only)" msgstr "" -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 msgid "Enable high resolution graphics" msgstr "" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 msgid "Enable high resolution graphics/content" msgstr "" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 #, fuzzy msgid "Prefer digital sound effects" msgstr "Volume dos efeitos sonoros especiais" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "" -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "" -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "" -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 #, fuzzy msgid "Use silver cursors" msgstr "Cursor normal" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" @@ -3551,7 +3582,7 @@ msgstr "Volume da Mњsica:" msgid "Subtitle speed: " msgstr "Rapidez legendas:" -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3561,7 +3592,7 @@ msgstr "" "LucasArts,\n" "mas %s estс faltando. Utilizando AdLib ao invщs." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 #, fuzzy msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " @@ -3741,6 +3772,15 @@ msgstr "" msgid "Show labels for objects on mouse hover" msgstr "" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/ru_RU.po b/po/ru_RU.po index ba91013bb5..46ff1853cd 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.8.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: 2016-02-21 23:32+0300\n" "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n" "Language-Team: Russian\n" @@ -212,7 +212,7 @@ msgstr "Сбросить все установки FluidSynth в значения по умолчанию." #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -503,7 +503,7 @@ msgstr "Выберите директорию для сохранений" msgid "This game ID is already taken. Please choose another one." msgstr "Этот ID игры уже используется. Пожалуйста, выберите другой." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "~В~ыход" @@ -591,17 +591,18 @@ msgid "Search:" msgstr "Поиск:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Загрузить игру:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Загрузить" @@ -1245,7 +1246,7 @@ msgstr "Растеризатор со сглаживанием" msgid "Antialiased" msgstr "Со сглаживанием" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Очистить значение" @@ -1372,17 +1373,17 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Янтарный" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "Кажется, что игра '%s' ещё неизвестна." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" "Пожалуйста, передайте следующие данные команде ScummVM вместе с названием" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "игры, которую вы пытаетесь добавить, и укажите её версию, язык и т.д." @@ -1390,11 +1391,11 @@ msgstr "игры, которую вы пытаетесь добавить, и укажите её версию, язык и т.д." msgid "~R~esume" msgstr "Продол~ж~ить" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "~З~агрузить" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "~З~аписать" @@ -1423,9 +1424,9 @@ msgstr "~В~ главное меню" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1440,9 +1441,10 @@ msgstr "Сохранить игру:" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1468,13 +1470,13 @@ msgstr "" "базовой информацией, а также инструкциями о том, как получить дальнейшую " "помощь." -#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 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/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "О~т~мена" @@ -1632,11 +1634,11 @@ msgstr "Аудио FM-Towns" msgid "PC-98 Audio" msgstr "Аудио PC-98" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "Настраиваю эмулятор MT-32" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "Эмулятор MT-32" @@ -1753,11 +1755,11 @@ msgstr "Режим автодрэга сейчас" msgid "Swipe three fingers to the right to toggle." msgstr "Проведите тремя пальцами направо для переключения." -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 msgid "OpenGL" msgstr "OpenGL" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "OpenGL (без фильтров)" @@ -2309,18 +2311,18 @@ msgstr "" #: backends/updates/macosx/macosx-updates.mm:67 msgid "Check for Updates..." -msgstr "Проверяю обновления..." +msgstr "Проверить обновления..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Использовать оригинальные экраны записи/чтения игры" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" @@ -2350,11 +2352,32 @@ msgstr "" "Включает поддержку мыши. Позволяет использовать мышь для перемещения и в " "меню игры." +#: engines/agi/detection.cpp:177 +msgid "Use Hercules hires font" +msgstr "Использовать шрифт Hercules" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" +"Использует шрифт высокого разрешения Hercules, если доступен файл со шрифтом." + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "Пауза во время ввода команд" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" +"Показывает окно со строкой ввода команды и ставит игру на паузу (как в SCI) " +"вместоввода в реальном времени." + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2364,13 +2387,13 @@ msgstr "Восстановить игру:" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Восстановить" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2381,7 +2404,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2392,7 +2415,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2639,29 +2662,37 @@ msgstr "" "открыть отладочную консоль ScummVM и ввести команду 'import_savefile'.\n" "\n" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "" + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "~Р~ежим быстрого перехода активирован" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "~П~ереходы активированы" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "~В~ыбросить страницу" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +msgid "Show ~M~ap" msgstr "П~о~казать карту" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +msgid "Main Men~u~" msgstr "~Г~лавное меню" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "~Э~ффекты воды включены" @@ -2783,38 +2814,38 @@ msgstr "Альтернативное вступление" msgid "Use an alternative game intro (CD version only)" msgstr "Использовать альтернативное вступление (только для CD-версии игры)" -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "Не делать аппроксимацию цветов EGA (полноцветные фоны)" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" "Пропускает проход аппроксимации цветов EGA, графика будет показана со всеми " "цветами" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 msgid "Enable high resolution graphics" msgstr "Включить отображение графики высокого разрешения" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 msgid "Enable high resolution graphics/content" msgstr "Включить графику и контент высокого рарешения" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Предпочитать цифровые звуковые эффекты" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "" "Отдавать предпочтение цифровым звуковым эффектам вместо синтезированных" -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "Использовать IMF/Yamaha FB-01 для вывода MIDI" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -2822,32 +2853,32 @@ msgstr "" "Использовать звуковую карту IBM Music Feature или модуль синтеза Yamaha " "FB-01 FM для MIDI" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "Использовать CD-аудио" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "" "Использовать звуковые дорожки с CD вместо музыки из файлов игры (если " "доступно)" -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "Использовать курсоры Windows" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "" "Использовать курсоры Windows (меньшие по размеру и одноцветные) вместо " "курсоров DOS" -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "Использовать серебряные курсоры" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" @@ -3518,7 +3549,7 @@ msgstr "Громк. музыки: " msgid "Subtitle speed: " msgstr "Скорость титров: " -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3527,7 +3558,7 @@ msgstr "" "Режим \"родного\" MIDI требует обновление Roland Upgrade от\n" "LucasArts, но не хватает %s. Переключаюсь на AdLib." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " "files for Maniac Mansion have to be in the 'Maniac' directory inside the " @@ -3708,6 +3739,17 @@ msgstr "Показывать названия объектов" msgid "Show labels for objects on mouse hover" msgstr "Показывает названия объектов при наведении курсора мыши" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "Использовать английскую озвучку" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" +"Использовать английскую озвучку вместо немецкой для всех языков кроме " +"немецкого" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/scummvm.pot b/po/scummvm.pot index 1edbe00e20..46866a5e73 100644 --- a/po/scummvm.pot +++ b/po/scummvm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.9.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -210,7 +210,7 @@ msgstr "" #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -496,7 +496,7 @@ msgstr "" msgid "This game ID is already taken. Please choose another one." msgstr "" -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "" @@ -584,17 +584,18 @@ msgid "Search:" msgstr "" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "" @@ -1221,7 +1222,7 @@ msgstr "" msgid "Antialiased" msgstr "" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "" @@ -1348,16 +1349,16 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "" -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "" @@ -1365,11 +1366,11 @@ msgstr "" msgid "~R~esume" msgstr "" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "" @@ -1398,9 +1399,9 @@ msgstr "" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1415,9 +1416,10 @@ msgstr "" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1437,13 +1439,13 @@ msgid "" "and for instructions on how to obtain further assistance." msgstr "" -#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "" -#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "" @@ -1576,11 +1578,11 @@ msgstr "" msgid "PC-98 Audio" msgstr "" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "" @@ -1697,11 +1699,11 @@ msgstr "" msgid "Swipe three fingers to the right to toggle." msgstr "" -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 msgid "OpenGL" msgstr "" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "" @@ -2255,14 +2257,14 @@ msgstr "" #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" @@ -2286,11 +2288,29 @@ msgid "" "Enables mouse support. Allows to use mouse for movement and in game menus." msgstr "" +#: engines/agi/detection.cpp:177 +msgid "Use Hercules hires font" +msgstr "" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2300,13 +2320,13 @@ msgstr "" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2314,7 +2334,7 @@ msgid "" "%s" msgstr "" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2322,7 +2342,7 @@ msgid "" "%s" msgstr "" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2540,29 +2560,37 @@ msgid "" "\n" msgstr "" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "" + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +msgid "Show ~M~ap" msgstr "" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +msgid "Main Men~u~" msgstr "" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "" @@ -2671,62 +2699,62 @@ msgstr "" msgid "Use an alternative game intro (CD version only)" msgstr "" -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 msgid "Enable high resolution graphics" msgstr "" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 msgid "Enable high resolution graphics/content" msgstr "" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "" -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "" -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "" -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" @@ -3396,14 +3424,14 @@ msgstr "" msgid "Subtitle speed: " msgstr "" -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" "but %s is missing. Using AdLib instead." msgstr "" -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " "files for Maniac Mansion have to be in the 'Maniac' directory inside the " @@ -3556,6 +3584,15 @@ msgstr "" msgid "Show labels for objects on mouse hover" msgstr "" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/sv_SE.po b/po/sv_SE.po index 82357b4dc2..7788870dea 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.5.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: 2016-02-25 23:06+0100\n" "Last-Translator: Hampus Flink <hampus.flink@gmail.com>\n" "Language-Team: \n" @@ -213,7 +213,7 @@ msgstr "" #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -505,7 +505,7 @@ msgstr "Vфlj katalog fіr spardata" msgid "This game ID is already taken. Please choose another one." msgstr "Detta ID-namn фr upptaget. Var god vфlj ett annat." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "~A~vsluta" @@ -593,17 +593,18 @@ msgid "Search:" msgstr "Sіk:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Ladda spel:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Ladda" @@ -1244,7 +1245,7 @@ msgstr "Antialiserad rendering" msgid "Antialiased" msgstr "Antialiserad" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Tіm sіkfфltet" @@ -1371,17 +1372,17 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Herkules bфrnsten" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "Spelet i '%s' verkar vara okфnt." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" "Var god rapportera fіljande data till ScummVM-teamet tillsammans med namnet" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "pх spelet du fіrsіkte lфgga till och dess version/sprхk/etc.:" @@ -1389,11 +1390,11 @@ msgstr "pх spelet du fіrsіkte lфgga till och dess version/sprхk/etc.:" msgid "~R~esume" msgstr "~F~ortsфtt" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "~L~adda" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "~S~para" @@ -1422,9 +1423,9 @@ msgstr "Хte~r~vфnd till launcher" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1439,9 +1440,10 @@ msgstr "Spara spelet:" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1466,13 +1468,13 @@ msgstr "" "Kunde inte spara data (%s)! Var god lфs README-filen fіr grundlфggande " "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/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 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/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "A~v~bryt" @@ -1628,11 +1630,11 @@ msgstr "FM Towns-ljud" msgid "PC-98 Audio" msgstr "PC-98 ljud" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "Initialiserar MT-32 emulator" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "MT-32 emulator" @@ -1749,11 +1751,11 @@ msgstr "Automatiskt draglфge " msgid "Swipe three fingers to the right to toggle." msgstr "Svep хt hіger med tre fingrar fіr att byta lфge." -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 msgid "OpenGL" msgstr "OpenGL" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "OpenGL (ingen filtrering)" @@ -2312,14 +2314,14 @@ msgstr "Sіk efter uppdateringar..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Anvфnd originalskфrmar fіr spara/ladda" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 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" @@ -2347,11 +2349,30 @@ msgstr "" "Aktiverar musstіd. Mіjliggіr anvфndning av musen fіr rіrelser och i " "spelmenyer." +#: engines/agi/detection.cpp:177 +#, fuzzy +msgid "Use Hercules hires font" +msgstr "Herkules grіn" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2361,13 +2382,13 @@ msgstr "Хterstфll spel:" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Хterstфll" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2378,7 +2399,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2389,7 +2410,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2636,29 +2657,39 @@ msgstr "" "och anvфnda kommandot 'import_savefile'.\n" "\n" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "" + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "~Z~iplфge aktiverat" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "жv~e~rgхngar aktiverade" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "Slфpp si~d~a" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +#, fuzzy +msgid "Show ~M~ap" msgstr "~V~isa karta" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +#, fuzzy +msgid "Main Men~u~" msgstr "Huvud~m~eny" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "~V~atteneffekt aktiverad" @@ -2782,35 +2813,35 @@ msgstr "Alternativt intro" msgid "Use an alternative game intro (CD version only)" msgstr "Anvфnd alternativt spelintro (endast CD-version)" -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "Skippa EGA-gitterpass (bakgrunder i full fфrg)" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "Skippa gitterpass i EGA-spel. Grafik visas i full fфrg." -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 msgid "Enable high resolution graphics" msgstr "Aktivera hіgupplіst grafik" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 msgid "Enable high resolution graphics/content" msgstr "Aktivera hіgupplіst grafik/innehхll" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Fіredra digitala ljudeffekter" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Fіredra digitala ljudeffekter istфllet fіr syntetiserade" -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "Anvфnd IMF/Yamaha FB-01 fіr MIDI-uppspelning" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -2818,29 +2849,29 @@ msgstr "" "Anvфnd ett IMB Music Feature-kort eller en Yamaha FB-01 FM synthmodul fіr " "MIDI-uppspelning" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "Anvфnd CD-ljud" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "Anvфnd CD-ljud istфllet fіr spelets ljud, om tillgфngligt" -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "Anvфnd Windows muspekare" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "" "Anvфnd Windows muspekare (mindre och svartvit) istфllet fіr DOS-pekaren" -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "Anvфnd silverpekare" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" @@ -3511,7 +3542,7 @@ msgstr "Musikvolym: " msgid "Subtitle speed: " msgstr "Texthastighet: " -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3520,7 +3551,7 @@ msgstr "" "Stіd fіr Native MIDI krфver Roland-uppdateringen frхn LucasArts,\n" "men %s saknas. Anvфnder AdLib istфllet." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " "files for Maniac Mansion have to be in the 'Maniac' directory inside the " @@ -3699,6 +3730,15 @@ msgstr "Visa etiketter" msgid "Show labels for objects on mouse hover" msgstr "Visar etiketter fіr objekten som musen pekar pх" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/uk_UA.po b/po/uk_UA.po index 5ab87a4155..fd7aae13d5 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: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: 2015-11-06 10:07+0300\n" "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n" "Language-Team: Ukrainian\n" @@ -212,7 +212,7 @@ msgstr "Скинути всі налаштування FluidSynth до їх значень за замовченням" #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -504,7 +504,7 @@ msgstr "Виберіть папку для збережень" msgid "This game ID is already taken. Please choose another one." msgstr "Цей ID гри вже використовується. Будь ласка, виберіть інший." -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "~В~ихід" @@ -592,17 +592,18 @@ msgid "Search:" msgstr "Пошук:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Завантажити гру:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Завантажити" @@ -1244,7 +1245,7 @@ msgstr "Растеризатор зі згладжуванням" msgid "Antialiased" msgstr "Зі згладжуванням" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Очистити значення" @@ -1371,16 +1372,16 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules бурштинний" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "Гра у '%s' невідома." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "Будь ласка, передайте нижченаведену інформацію команді ScummVM разом з" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "назвою гри, яку ви намагаєтесь додати, а також її версію/мову/та інше:" @@ -1388,11 +1389,11 @@ msgstr "назвою гри, яку ви намагаєтесь додати, а також її версію/мову/та інше:" msgid "~R~esume" msgstr "Продов~ж~ити" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "~З~авантажити" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "~З~аписати" @@ -1421,9 +1422,9 @@ msgstr "~П~овер.в головне меню" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1438,9 +1439,10 @@ msgstr "Зберегти гру: " #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1465,13 +1467,13 @@ msgstr "" "Збереження стану гри не вдалося (%s)!. Будь-ласка, дивіться файл README для " "основної інормації, а також інструкцій, як отримати подальшу допомогу." -#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 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/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "Ві~д~міна" @@ -1627,11 +1629,11 @@ msgstr "Аудіо FM-Towns" msgid "PC-98 Audio" msgstr "Аудіо PC-98" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "Налаштовую емулятор MT-32" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "Емулятор MT-32" @@ -1748,11 +1750,11 @@ msgstr "Режим самотягнення включено" msgid "Swipe three fingers to the right to toggle." msgstr "Проведіть трьома пальцямі направо для переключення." -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 msgid "OpenGL" msgstr "OpenGL" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "OpenGL (без фільтрів)" @@ -2306,18 +2308,18 @@ msgstr "" #: backends/updates/macosx/macosx-updates.mm:67 msgid "Check for Updates..." -msgstr "Перевіряю оновлення..." +msgstr "Перевірити оновлення..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Використовувати ориг. збереження/завантаження екрани" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" @@ -2346,11 +2348,33 @@ msgstr "" "Включає підтримку миші. Дозволяє використовувати мишу для пересування та " "управління меню." +#: engines/agi/detection.cpp:177 +msgid "Use Hercules hires font" +msgstr "Використовувати шрифт Hercules" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" +"Використовує шрифт високого розгалуження Hercules, якщо файл з шрифтом є " +"досупний" + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "Ставити на паузу під час вводу команд" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" +"Показує вікно для вводу команди та ставить гру на паузу (подібно до SCI)," +"замість безпосереднього вводу." + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2360,13 +2384,13 @@ msgstr "Відновити гру:" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Відновити" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2377,7 +2401,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2388,7 +2412,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2633,29 +2657,37 @@ msgstr "" "відкрити консоль відладчика і ввести команду 'import_savefile'.\n" "\n" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "" + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "Режим швидкого переходу активовано" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "Переходи активовано" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "Викинути сторінку" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +msgid "Show ~M~ap" msgstr "Показати мапу" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +msgid "Main Men~u~" msgstr "Головне меню" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "Ефекти води увімкнено" @@ -2776,37 +2808,37 @@ msgstr "Алтернативний вступ" msgid "Use an alternative game intro (CD version only)" msgstr "Використовувати альтернативний вступ гри (тільки CD версія)" -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "Не робити растрування EGA (фони у повному кольорі)" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "" "Не робити крок растрування у іграх EGA, графіку буде показано у повному " "кольорі" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 msgid "Enable high resolution graphics" msgstr "Увімкнути графіку високого розгалуження" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 msgid "Enable high resolution graphics/content" msgstr "Увімкнути графіку та контент у високому розгалуженні" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Надавати перевагу цифровим звуковим ефектам" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Віддавати перевагу цифровим звуковим ефектам, а не синтезованим" -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "Використовувати IMF/Yahama FB-01 для MIDI виходу" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -2814,28 +2846,28 @@ msgstr "" "Використовувати дляв виводу MIDI режим карти IBM Feature або FM сінтез " "Yamaha FB-01" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "Використовувати CD аудіо" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "Використовувати CD аудіо замість у-грі аудіо, якщо такі є" -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "Використовувати Windows курсори" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "Використовувати Windows курсори (менших і монохромних), замість DOS" -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "Використовувати срібні курсори" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" @@ -3507,7 +3539,7 @@ msgstr "Гучність музики: " msgid "Subtitle speed: " msgstr "Швид. субтитрів: " -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3516,7 +3548,7 @@ msgstr "" "Режим \"рідного\" MIDI потребує поновлення Roland Upgrade від\n" "LucasArts, проте %s відсутній. Перемикаюсь на AdLib." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " "files for Maniac Mansion have to be in the 'Maniac' directory inside the " @@ -3551,8 +3583,8 @@ msgid "" "Files button in-game shows original savegame dialog rather than the ScummVM " "menu" msgstr "" -"Кнопка \"Файли\" у грі показуватиме оригінальний екран збереження " -"замість меню ScummVM" +"Кнопка \"Файли\" у грі показуватиме оригінальний екран збереження замість " +"меню ScummVM" #: engines/sherlock/detection.cpp:81 msgid "Pixellated scene transitions" @@ -3571,8 +3603,8 @@ msgid "" "Only show hotspot names after you actually click on a hotspot or action " "button" msgstr "" -"Показувати назви цікавих точок тільки після безпосереднього кліку по ним " -"або дії з ними" +"Показувати назви цікавих точок тільки після безпосереднього кліку по ним або " +"дії з ними" #: engines/sherlock/detection.cpp:101 msgid "Show character portraits" @@ -3694,6 +3726,17 @@ msgstr "Показувати мітки об'єктів" msgid "Show labels for objects on mouse hover" msgstr "Показувати мітки для об'єктів при наведенні миші" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "Використовувати озвучення англійською" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" +"Використовувати озвучення англійскою замість німецького для всіх мов окрім " +"німецької" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" diff --git a/po/zh-Latn_CN.po b/po/zh-Latn_CN.po index 12105429a7..02f8df1b46 100644 --- a/po/zh-Latn_CN.po +++ b/po/zh-Latn_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.9.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2016-02-20 21:22+0000\n" +"POT-Creation-Date: 2016-04-01 19:18+0200\n" "PO-Revision-Date: 2016-03-15 04:09-0700\n" "Last-Translator: Chenbo Li <lichenbo1949@gmail.com>\n" "Language-Team: Chenbo Li <lichenbo1949@gmail.com>\n" @@ -210,7 +210,7 @@ msgstr "Chongzhi Suoyou de FluidSynth Shezhi" #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 #: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274 -#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834 +#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1831 #: 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 @@ -499,7 +499,7 @@ msgstr "Xuanze Youxi Baocun Mulu" msgid "This game ID is already taken. Please choose another one." msgstr "Ci Youxi ID Yi Bei Zhanyong. Qing Xuanze Qita Mingcheng" -#: gui/launcher.cpp:626 engines/dialogs.cpp:111 +#: gui/launcher.cpp:626 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:115 msgid "~Q~uit" msgstr "~Q~Tuichu" @@ -587,17 +587,18 @@ msgid "Search:" msgstr "Sousuo:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214 -#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353 -#: engines/tsage/scenes.cpp:600 +#: engines/mohawk/dialogs.cpp:120 engines/mohawk/riven.cpp:718 +#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600 msgid "Load game:" msgstr "Jiazai Youxi:" #: gui/launcher.cpp:685 engines/dialogs.cpp:115 #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 -#: engines/cruise/menu.cpp:214 engines/mohawk/riven.cpp:718 -#: engines/parallaction/saveload.cpp:197 engines/pegasus/pegasus.cpp:353 -#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600 +#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:120 +#: engines/mohawk/riven.cpp:718 engines/parallaction/saveload.cpp:197 +#: engines/pegasus/pegasus.cpp:353 engines/scumm/dialogs.cpp:189 +#: engines/tsage/scenes.cpp:600 msgid "Load" msgstr "Jiazai" @@ -1236,7 +1237,7 @@ msgstr "Fanjuchi Xuanranqi" msgid "Antialiased" msgstr "Fanjuchi" -#: gui/widget.cpp:323 gui/widget.cpp:325 gui/widget.cpp:331 gui/widget.cpp:333 +#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 msgid "Clear value" msgstr "Qingchu Zhi" @@ -1363,16 +1364,16 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Amber" -#: engines/advancedDetector.cpp:317 +#: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." msgstr "'%s' Zhong de Youxi Weizhi." -#: engines/advancedDetector.cpp:318 +#: engines/advancedDetector.cpp:335 msgid "Please, report the following data to the ScummVM team along with name" msgstr "Qing JIang Xialie Shuju Yiji Youxi Baogao Gei ScummVM Tuandui" -#: engines/advancedDetector.cpp:320 +#: engines/advancedDetector.cpp:337 msgid "of the game you tried to add and its version/language/etc.:" msgstr "BingQie Fushang Shitu Tianjia de Youximing Yiji Banben/Yuyan Deng" @@ -1380,11 +1381,11 @@ msgstr "BingQie Fushang Shitu Tianjia de Youximing Yiji Banben/Yuyan Deng" msgid "~R~esume" msgstr "~R~Jixu" -#: engines/dialogs.cpp:87 +#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:113 msgid "~L~oad" msgstr "~L~Zairu" -#: engines/dialogs.cpp:91 +#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:114 msgid "~S~ave" msgstr "~S~Baocun" @@ -1413,9 +1414,9 @@ msgstr "~R~Fanhui Qidongqi" #: engines/avalanche/parser.cpp:1899 engines/cge/events.cpp:74 #: engines/cge2/events.cpp:67 engines/cruise/menu.cpp:212 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261 -#: engines/hugo/file.cpp:298 engines/neverhood/menumodule.cpp:877 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/hugo/file.cpp:298 engines/mohawk/dialogs.cpp:121 +#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save game:" @@ -1430,9 +1431,10 @@ msgstr "Baocun Youxi:" #: engines/cge/events.cpp:74 engines/cge2/events.cpp:67 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336 #: engines/dreamweb/saveload.cpp:261 engines/hugo/file.cpp:298 -#: engines/neverhood/menumodule.cpp:877 engines/parallaction/saveload.cpp:212 -#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:768 -#: engines/scumm/dialogs.cpp:188 engines/sherlock/scalpel/scalpel.cpp:1249 +#: engines/mohawk/dialogs.cpp:121 engines/neverhood/menumodule.cpp:877 +#: engines/parallaction/saveload.cpp:212 engines/pegasus/pegasus.cpp:377 +#: engines/sci/engine/kfile.cpp:778 engines/scumm/dialogs.cpp:188 +#: engines/sherlock/scalpel/scalpel.cpp:1250 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:281 #: engines/toon/toon.cpp:3338 engines/tsage/scenes.cpp:598 msgid "Save" @@ -1456,13 +1458,13 @@ msgstr "" "Cundang Baocun Shibai (%s)! Qing Chayue README Huode Jiben Xinxi, Yiji " "Gengduo Xinxi" -#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109 -#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106 +#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:117 +#: engines/mohawk/dialogs.cpp:242 engines/tsage/dialogs.cpp:106 msgid "~O~K" msgstr "~O~Queding" -#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110 -#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107 +#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:118 +#: engines/mohawk/dialogs.cpp:243 engines/tsage/dialogs.cpp:107 msgid "~C~ancel" msgstr "~C~Quxiao" @@ -1618,11 +1620,11 @@ msgstr "FM-Towns Yinpin" msgid "PC-98 Audio" msgstr "PC-98 Yinpin" -#: audio/softsynth/mt32.cpp:200 +#: audio/softsynth/mt32.cpp:196 msgid "Initializing MT-32 Emulator" msgstr "Chushihua MT-32 Moniqi" -#: audio/softsynth/mt32.cpp:426 +#: audio/softsynth/mt32.cpp:434 msgid "MT-32 Emulator" msgstr "MT-32 Moniqi" @@ -1739,11 +1741,11 @@ msgstr "Muqian Wei Zidong Tuozhuai Moshi" msgid "Swipe three fingers to the right to toggle." msgstr "Xiangyou Huadong San Gen Shouzhi Qiehuan" -#: backends/graphics/opengl/opengl-graphics.cpp:119 +#: backends/graphics/opengl/opengl-graphics.cpp:126 msgid "OpenGL" msgstr "OpenGL" -#: backends/graphics/opengl/opengl-graphics.cpp:120 +#: backends/graphics/opengl/opengl-graphics.cpp:127 msgid "OpenGL (No filtering)" msgstr "OpenGL" @@ -2299,14 +2301,14 @@ msgstr "Jiancha Gengxin..." #: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70 #: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47 -#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:404 +#: engines/neverhood/detection.cpp:160 engines/sci/detection.cpp:410 #: engines/toltecs/detection.cpp:200 engines/zvision/detection_tables.h:51 msgid "Use original save/load screens" msgstr "Shiyong Yuanshi Baocun/Zairu Pingmu" #: engines/agi/detection.cpp:148 engines/cine/detection.cpp:71 #: engines/drascula/detection.cpp:303 engines/dreamweb/detection.cpp:48 -#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:405 +#: engines/neverhood/detection.cpp:161 engines/sci/detection.cpp:411 #: engines/toltecs/detection.cpp:201 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Shiyong Yuanshi Baocun/Zairu Pingmu, Bu Shiyong ScummVM de" @@ -2332,11 +2334,30 @@ msgstr "" "Qiyong shubiao zhichi. Yunxu Shiyong Shubiao jinxing Yidong He Youxi Nei " "Caidan" +#: engines/agi/detection.cpp:177 +#, fuzzy +msgid "Use Hercules hires font" +msgstr "Hercules Green" + +#: engines/agi/detection.cpp:178 +msgid "Uses Hercules hires font, when font file is available." +msgstr "" + +#: engines/agi/detection.cpp:187 +msgid "Pause when entering commands" +msgstr "" + +#: engines/agi/detection.cpp:188 +msgid "" +"Shows a command prompt window and pauses the game (like in SCI) instead of a " +"real-time prompt." +msgstr "" + #: engines/agi/saveload.cpp:777 engines/avalanche/parser.cpp:1887 #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore game:" @@ -2346,13 +2367,13 @@ msgstr "Huifu Youxi:" #: engines/cge/events.cpp:85 engines/cge2/events.cpp:78 #: engines/drascula/saveload.cpp:349 engines/dreamweb/saveload.cpp:169 #: engines/hugo/file.cpp:400 engines/neverhood/menumodule.cpp:890 -#: engines/sci/engine/kfile.cpp:867 engines/sherlock/scalpel/scalpel.cpp:1262 +#: engines/sci/engine/kfile.cpp:877 engines/sherlock/scalpel/scalpel.cpp:1263 #: engines/sherlock/tattoo/widget_files.cpp:94 engines/toltecs/menu.cpp:256 #: engines/toon/toon.cpp:3430 msgid "Restore" msgstr "Huifu" -#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377 +#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2374 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2363,7 +2384,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2370 +#: engines/agos/saveload.cpp:195 engines/scumm/scumm.cpp:2367 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2374,7 +2395,7 @@ msgstr "" "\n" "%s" -#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2388 +#: engines/agos/saveload.cpp:203 engines/scumm/scumm.cpp:2385 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2620,29 +2641,39 @@ msgstr "" "'import_savefile'.\n" "\n" +#: engines/mohawk/detection.cpp:168 +msgid "Play the Myst fly by movie" +msgstr "" + +#: engines/mohawk/detection.cpp:169 +msgid "The Myst fly by movie was not played by the original engine." +msgstr "" + #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167 +#: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 msgid "~Z~ip Mode Activated" msgstr "~Z~Yasuo Moshi Qidong" -#: engines/mohawk/dialogs.cpp:93 +#: engines/mohawk/dialogs.cpp:97 msgid "~T~ransitions Enabled" msgstr "~T~Qiyong Zhuanyi" #. I18N: Drop book page -#: engines/mohawk/dialogs.cpp:95 +#: engines/mohawk/dialogs.cpp:99 msgid "~D~rop Page" msgstr "~D~shanchu Yemian" -#: engines/mohawk/dialogs.cpp:99 -msgid "~S~how Map" +#: engines/mohawk/dialogs.cpp:103 +#, fuzzy +msgid "Show ~M~ap" msgstr "~S~Xianshi Ditu" -#: engines/mohawk/dialogs.cpp:105 -msgid "~M~ain Menu" +#: engines/mohawk/dialogs.cpp:109 +#, fuzzy +msgid "Main Men~u~" msgstr "~M~Zhucaidan" -#: engines/mohawk/dialogs.cpp:168 +#: engines/mohawk/dialogs.cpp:240 msgid "~W~ater Effect Enabled" msgstr "~W~Qiyong Shuimian Xiaoguo" @@ -2762,35 +2793,35 @@ msgstr "QIta Jieshao" msgid "Use an alternative game intro (CD version only)" msgstr "Shiyong Qita Youxi Jieshao (Jin CD Ban)" -#: engines/sci/detection.cpp:374 +#: engines/sci/detection.cpp:380 msgid "Skip EGA dithering pass (full color backgrounds)" msgstr "Tiaoguo EGA Doudong (quancai Beijing)" -#: engines/sci/detection.cpp:375 +#: engines/sci/detection.cpp:381 msgid "Skip dithering pass in EGA games, graphics are shown with full colors" msgstr "tiaoguo EGA Youxi Zhong de Doudong, Tuxiang Yi Quancai Xianshi" -#: engines/sci/detection.cpp:384 +#: engines/sci/detection.cpp:390 msgid "Enable high resolution graphics" msgstr "QIyong Gaofenbianlv Tu" -#: engines/sci/detection.cpp:385 +#: engines/sci/detection.cpp:391 msgid "Enable high resolution graphics/content" msgstr "Qiyong Gaofenbianlv Tubian/Neirong" -#: engines/sci/detection.cpp:394 +#: engines/sci/detection.cpp:400 msgid "Prefer digital sound effects" msgstr "Youxianshiyong Shuzi Yinxiao" -#: engines/sci/detection.cpp:395 +#: engines/sci/detection.cpp:401 msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Youxian SHiyong shuzi YInxiao, er fei Hecheng" -#: engines/sci/detection.cpp:414 +#: engines/sci/detection.cpp:420 msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "Shiyong IMF/yamaha Fb-01 Huo MIDI shuchu" -#: engines/sci/detection.cpp:415 +#: engines/sci/detection.cpp:421 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" @@ -2798,28 +2829,28 @@ msgstr "" "Shiyong IBM Music Feature Ka Huozhe Yamaha FB-01 FM hecheng Mokuai zuowei " "MIDI shuchu" -#: engines/sci/detection.cpp:425 +#: engines/sci/detection.cpp:431 msgid "Use CD audio" msgstr "Shiyong CD YInpin" -#: engines/sci/detection.cpp:426 +#: engines/sci/detection.cpp:432 msgid "Use CD audio instead of in-game audio, if available" msgstr "Shiyong CD Yinpin erfei Youxinei Yinpin (ruguo keyong)" -#: engines/sci/detection.cpp:436 +#: engines/sci/detection.cpp:442 msgid "Use Windows cursors" msgstr "Shiyong WIndows Guangbiao" -#: engines/sci/detection.cpp:437 +#: engines/sci/detection.cpp:443 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "Shiyong Windows Guangbiao (gengxiao Danse) erfei DOS Guangbiao" -#: engines/sci/detection.cpp:447 +#: engines/sci/detection.cpp:453 msgid "Use silver cursors" msgstr "Shiyong Yinse Guangbiao" -#: engines/sci/detection.cpp:448 +#: engines/sci/detection.cpp:454 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "Shiyong Qita Yinse Guangbiao" @@ -3489,7 +3520,7 @@ msgstr "Yinyue Yinliang:" msgid "Subtitle speed: " msgstr "Zimu Sudu:" -#: engines/scumm/scumm.cpp:1832 +#: engines/scumm/scumm.cpp:1829 #, c-format msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" @@ -3498,7 +3529,7 @@ msgstr "" "Bendi MIDI Zhichi Xuyao Cong LucasArts Shengji Zhi Roland,\n" "Dnahsi %s meiyou zhaodao. Shiyong AdLib." -#: engines/scumm/scumm.cpp:2644 +#: engines/scumm/scumm.cpp:2645 msgid "" "Usually, Maniac Mansion would start now. But for that to work, the game " "files for Maniac Mansion have to be in the 'Maniac' directory inside the " @@ -3671,6 +3702,15 @@ msgstr "Xianshi Wuti Biaoqian" msgid "Show labels for objects on mouse hover" msgstr "Dang Shubiao Yishang Shi Xianshi Wuti Biaoqian" +#: engines/sword25/detection.cpp:46 +msgid "Use English speech" +msgstr "" + +#: engines/sword25/detection.cpp:47 +msgid "" +"Use English speech instead of German for every language other than German" +msgstr "" + #: engines/teenagent/resources.cpp:95 msgid "" "You're missing the 'teenagent.dat' file. Get it from the ScummVM website" @@ -53,8 +53,43 @@ ifdef DYNAMIC_MODULES endif # Special target to create a application wrapper for Mac OS X + +ifdef USE_DOCKTILEPLUGIN + +# The NsDockTilePlugIn needs to be compiled in both 32 and 64 bits irrespective of how ScummVM itself is compiled. +# Therefore do not use $(CXXFLAGS) and $(LDFLAGS). + +ScummVMDockTilePlugin32.o: + $(CXX) -mmacosx-version-min=10.6 -arch i386 -O2 -c $(srcdir)/backends/taskbar/macosx/dockplugin/dockplugin.m -o ScummVMDockTilePlugin32.o + +ScummVMDockTilePlugin32: ScummVMDockTilePlugin32.o + $(CXX) -mmacosx-version-min=10.6 -arch i386 -bundle -framework Foundation -framework AppKit -fobjc-link-runtime ScummVMDockTilePlugin32.o -o ScummVMDockTilePlugin32 + +ScummVMDockTilePlugin64.o: + $(CXX) -mmacosx-version-min=10.6 -arch x86_64 -O2 -c $(srcdir)/backends/taskbar/macosx/dockplugin/dockplugin.m -o ScummVMDockTilePlugin64.o + +ScummVMDockTilePlugin64: ScummVMDockTilePlugin64.o + $(CXX) -mmacosx-version-min=10.6 -arch x86_64 -bundle -framework Foundation -framework AppKit -fobjc-link-runtime ScummVMDockTilePlugin64.o -o ScummVMDockTilePlugin64 + +ScummVMDockTilePlugin: ScummVMDockTilePlugin32 ScummVMDockTilePlugin64 + lipo -create ScummVMDockTilePlugin32 ScummVMDockTilePlugin64 -output ScummVMDockTilePlugin + +scummvm.docktileplugin: ScummVMDockTilePlugin + mkdir -p scummvm.docktileplugin/Contents + cp $(srcdir)/dists/macosx/dockplugin/Info.plist scummvm.docktileplugin/Contents + mkdir -p scummvm.docktileplugin/Contents/MacOS + cp ScummVMDockTilePlugIn scummvm.docktileplugin/Contents/MacOS/ + chmod 644 scummvm.docktileplugin/Contents/MacOS/ScummVMDockTilePlugIn + +endif + bundle_name = ScummVM.app + +ifdef USE_DOCKTILEPLUGIN +bundle: scummvm-static scummvm.docktileplugin +else bundle: scummvm-static +endif mkdir -p $(bundle_name)/Contents/MacOS mkdir -p $(bundle_name)/Contents/Resources echo "APPL????" > $(bundle_name)/Contents/PkgInfo @@ -62,7 +97,8 @@ bundle: scummvm-static ifdef USE_SPARKLE mkdir -p $(bundle_name)/Contents/Frameworks cp $(srcdir)/dists/macosx/dsa_pub.pem $(bundle_name)/Contents/Resources/ - cp -R $(STATICLIBPATH)/Sparkle.framework $(bundle_name)/Contents/Frameworks/ + rm -rf $(bundle_name)/Contents/Frameworks/Sparkle.framework + cp -R $(SPARKLEPATH)/Sparkle.framework $(bundle_name)/Contents/Frameworks/ endif cp $(srcdir)/icons/scummvm.icns $(bundle_name)/Contents/Resources/ cp $(DIST_FILES_DOCS) $(bundle_name)/ @@ -75,6 +111,10 @@ endif cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm chmod 755 $(bundle_name)/Contents/MacOS/scummvm $(STRIP) $(bundle_name)/Contents/MacOS/scummvm +ifdef USE_DOCKTILEPLUGIN + mkdir -p $(bundle_name)/Contents/PlugIns + cp -r scummvm.docktileplugin $(bundle_name)/Contents/PlugIns/ +endif iphonebundle: iphone mkdir -p $(bundle_name) @@ -290,7 +330,10 @@ OSX_ZLIB ?= $(STATICLIBPATH)/lib/libz.a endif ifdef USE_SPARKLE -OSX_STATIC_LIBS += -framework Sparkle -F$(STATICLIBPATH) +ifneq ($(SPARKLEPATH),) +OSX_STATIC_LIBS += -F$(SPARKLEPATH) +endif +OSX_STATIC_LIBS += -framework Sparkle -Wl,-rpath,@loader_path/../Frameworks endif # Special target to create a static linked binary for Mac OS X. @@ -363,6 +406,9 @@ osxsnap: bundle ScummVM-snapshot.dmg rm -rf ScummVM-snapshot +publish-appcast: + scp dists/macosx/scummvm_appcast.xml www.scummvm.org:/var/www/html/appcasts/macosx/release.xml + # # Windows specific # @@ -441,12 +487,12 @@ CUR_BRANCH := $(shell cd $(srcdir); git describe --all |cut -d '-' -f 4-) ideprojects: devtools/create_project ifeq ($(VER_DIRTY), -dirty) - $(error You have uncommitted changes) -endif + $(error You have uncommitted changes) +endif ifeq "$(CUR_BRANCH)" "heads/master" - $(error You cannot do it on master) + $(error You cannot do it on master) else ifeq "$(CUR_BRANCH)" "" - $(error You must be on a release branch) + $(error You must be on a release branch) endif @echo Creating Code::Blocks project files... @cd $(srcdir)/dists/codeblocks && ../../devtools/create_project/create_project ../.. --codeblocks >/dev/null && git add -f engines/plugins_table.h *.workspace *.cbp |