diff options
355 files changed, 5920 insertions, 3737 deletions
@@ -21,6 +21,15 @@ For a more comprehensive changelog of the latest experimental code, see: CinE: - Fixed sound effect loading. + Drascula: + - Fixed text alignment to be faithful to the original. + - Fixed character walking off screen. + - Fixed loading savegames in the Pendulum scene. + - Fixed wrong background for inventory items during chapter 6 in the + Spanish version. + - Fixed animations speed (they were running two times slower than in the + original engine). + Gob: - Fixed lock up for some games during sound initialization. @@ -32,6 +41,15 @@ For a more comprehensive changelog of the latest experimental code, see: - Fixed user interface colors in the French and German versions of I Have No Mouth and I Must Scream. + SCI: + - Make cursor workarounds work properly on OpenPandora (and other devices, that + support touch screen and analog sticks/mouse at the same time) + - Script patch to fix broken ending battle in multilingual King's Quest 5 + (French, German + Spanish versions are all broken) + - Fixed invalid memory access, when loading broken King's Quest 5 credit music track + - Fixed lowres/hires issues in King's Quest 6 when saving, changing the lowres/hires + setting and restoring the saved game afterwards. + SCUMM: - Fixed detection of Maniac Mansion from Day of the Tentacle in the Windows version of ScummVM. diff --git a/audio/adlib.cpp b/audio/adlib.cpp index f609164495..3e3f5c047c 100644 --- a/audio/adlib.cpp +++ b/audio/adlib.cpp @@ -20,7 +20,6 @@ * */ -#include "audio/softsynth/emumidi.h" #include "common/debug.h" #include "common/error.h" #include "common/scummsys.h" diff --git a/audio/decoders/3do.cpp b/audio/decoders/3do.cpp index 6d558d4c8c..60cc515fdd 100644 --- a/audio/decoders/3do.cpp +++ b/audio/decoders/3do.cpp @@ -25,7 +25,6 @@ #include "common/util.h" #include "audio/decoders/3do.h" -#include "audio/decoders/raw.h" #include "audio/decoders/adpcm_intern.h" namespace Audio { diff --git a/audio/decoders/3do.h b/audio/decoders/3do.h index 7524358543..7f617c6643 100644 --- a/audio/decoders/3do.h +++ b/audio/decoders/3do.h @@ -31,19 +31,12 @@ #include "common/scummsys.h" #include "common/types.h" -#include "common/substream.h" +#include "common/stream.h" #include "audio/audiostream.h" -#include "audio/decoders/raw.h" - -namespace Common { -class SeekableReadStream; -} namespace Audio { -class SeekableAudioStream; - // amount of bytes to be used within the decoder classes as buffers #define AUDIO_3DO_CACHE_SIZE 1024 diff --git a/audio/miles_adlib.cpp b/audio/miles_adlib.cpp index bf5c9d4a73..0693d1e7ac 100644 --- a/audio/miles_adlib.cpp +++ b/audio/miles_adlib.cpp @@ -27,7 +27,6 @@ #include "common/textconsole.h" #include "audio/fmopl.h" -#include "audio/softsynth/emumidi.h" namespace Audio { diff --git a/audio/mods/protracker.cpp b/audio/mods/protracker.cpp index 2578e9488a..ce52b61e04 100644 --- a/audio/mods/protracker.cpp +++ b/audio/mods/protracker.cpp @@ -24,8 +24,6 @@ #include "audio/mods/paula.h" #include "audio/mods/module.h" -#include "audio/audiostream.h" - #include "common/textconsole.h" namespace Modules { diff --git a/audio/softsynth/fmtowns_pc98/towns_audio.h b/audio/softsynth/fmtowns_pc98/towns_audio.h index 93eeafb046..0003f02777 100644 --- a/audio/softsynth/fmtowns_pc98/towns_audio.h +++ b/audio/softsynth/fmtowns_pc98/towns_audio.h @@ -23,7 +23,9 @@ #ifndef TOWNS_AUDIO_H #define TOWNS_AUDIO_H -#include "audio/mixer.h" +namespace Audio { +class Mixer; +} class TownsAudioInterfaceInternal; diff --git a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp index 0b9cc0c7e8..7a248f1859 100644 --- a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp +++ b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp @@ -35,6 +35,10 @@ static const OSystem::GraphicsMode s_supportedGraphicsModes[] = { {0, 0, 0} }; +#ifndef USE_SCALERS +#define DownscaleAllByHalf 0 +#endif + DINGUXSdlGraphicsManager::DINGUXSdlGraphicsManager(SdlEventSource *boss, SdlWindow *window) : SurfaceSdlGraphicsManager(boss, window) { } @@ -61,9 +65,11 @@ bool DINGUXSdlGraphicsManager::setGraphicsMode(int mode) { case GFX_NORMAL: newScaleFactor = 1; break; +#ifdef USE_SCALERS case GFX_HALF: newScaleFactor = 1; break; +#endif default: warning("unknown gfx mode %d", mode); return false; @@ -89,9 +95,11 @@ void DINGUXSdlGraphicsManager::setGraphicsModeIntern() { case GFX_NORMAL: newScalerProc = Normal1x; break; +#ifdef USE_SCALERS case GFX_HALF: newScalerProc = DownscaleAllByHalf; break; +#endif default: error("Unknown gfx mode %d", _videoMode.mode); diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h index b567142b8f..6cd938ec9c 100644 --- a/backends/platform/dc/dc.h +++ b/backends/platform/dc/dc.h @@ -63,7 +63,7 @@ public: bool isPlaying() const; // Play cdrom audio track - void play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate = false); + bool play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate = false); // Stop cdrom audio track void stop(); diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp index bd66b81b35..c84aef9c47 100644 --- a/backends/platform/dc/dcmain.cpp +++ b/backends/platform/dc/dcmain.cpp @@ -90,12 +90,18 @@ static bool find_track(int track, int &first_sec, int &last_sec) return false; } -void DCCDManager::play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate) { +bool DCCDManager::play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate) { DefaultAudioCDManager::play(track, numLoops, startFrame, duration, onlyEmulate); - // If we're playing now, are set to only emulate, return here - if (isPlaying() || onlyEmulate) - return; + // If we're playing now return here + if (isPlaying()) { + return true; + } + + // If we should only play emulated tracks stop here. + if (onlyEmulate) { + return false; + } int firstSec, lastSec; #if 1 @@ -106,16 +112,18 @@ void DCCDManager::play(int track, int numLoops, int startFrame, int duration, bo if (numLoops > 14) numLoops = 14; else if (numLoops < 0) - num_loops = 15; // infinity + numLoops = 15; // infinity if (!find_track(track, firstSec, lastSec)) - return; + return false; if (duration) lastSec = firstSec + startFrame + duration; - firstSec += startFrame; + firstSec += startFrame; play_cdda_sectors(firstSec, lastSec, numLoops); + + return true; } void DCCDManager::stop() { diff --git a/backends/platform/dingux/build.gcw0.sh b/backends/platform/dingux/build.gcw0.sh index c1a4fa29c2..7a31d4fd27 100755 --- a/backends/platform/dingux/build.gcw0.sh +++ b/backends/platform/dingux/build.gcw0.sh @@ -3,4 +3,4 @@ export PATH=/opt/gcw0-toolchain/usr/bin:$PATH # Disable high resolution engines since we have 320x240 hardware -./configure --host=gcw0 --enable-plugins --default-dynamic --enable-release --disable-mt32emu --disable-hq-scalers && make -j6 gcw-opk && ls -l scummvm.opk +./configure --host=gcw0 --enable-plugins --default-dynamic --enable-release && make -j6 gcw-opk && ls -l scummvm.opk diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk index 56c26c3be1..b7f700d7fd 100644 --- a/backends/platform/dingux/dingux.mk +++ b/backends/platform/dingux/dingux.mk @@ -59,7 +59,8 @@ endif echo >> $(gcw0_bundle)/README.man.txt echo '[General README]' >> $(gcw0_bundle)/README.man.txt echo >> $(gcw0_bundle)/README.man.txt - cat README >> $(gcw0_bundle)/README.man.txt + cat README | sed -e 's/\[/тІ/g' -e 's/\]/тЇ/g' -e '/^1\.1)/,$$ s/^[0-9][0-9]*\.[0-9][0-9]*.*/\[&\]/' >> $(gcw0_bundle)/README.man.txt + # $(CP) GeneralUser\ GS\ FluidSynth\ v1.44.sf2 $(gcw0_bundle)/ diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h index f9da09d3eb..e2465e4767 100644 --- a/backends/platform/symbian/src/portdefs.h +++ b/backends/platform/symbian/src/portdefs.h @@ -65,7 +65,8 @@ typedef signed long int int32; #undef remove #endif -#define SMALL_SCREEN_DEVICE +#define GUI_ONLY_FULLSCREEN +#define GUI_ENABLE_KEYSDIALOG #define DISABLE_COMMAND_LINE #define USE_RGB_COLOR diff --git a/backends/platform/wince/portdefs.h b/backends/platform/wince/portdefs.h index 3304ee0893..c74fc39169 100644 --- a/backends/platform/wince/portdefs.h +++ b/backends/platform/wince/portdefs.h @@ -30,7 +30,8 @@ // Missing string/stdlib/assert declarations for WinCE 2.xx #if _WIN32_WCE < 300 - #define SMALL_SCREEN_DEVICE + #define GUI_ONLY_FULLSCREEN + #define GUI_ENABLE_KEYSDIALOG void *calloc(size_t n, size_t s); int isalnum(int c); diff --git a/backends/updates/macosx/macosx-updates.h b/backends/updates/macosx/macosx-updates.h index 9f541ad02a..6fb9af7712 100644 --- a/backends/updates/macosx/macosx-updates.h +++ b/backends/updates/macosx/macosx-updates.h @@ -41,6 +41,8 @@ public: virtual void setUpdateCheckInterval(int interval); virtual int getUpdateCheckInterval(); + + virtual bool getLastUpdateCheckTimeAndDate(TimeDate &t); }; #endif diff --git a/backends/updates/macosx/macosx-updates.mm b/backends/updates/macosx/macosx-updates.mm index fc967f8fec..db9362a459 100644 --- a/backends/updates/macosx/macosx-updates.mm +++ b/backends/updates/macosx/macosx-updates.mm @@ -23,6 +23,7 @@ // Disable symbol overrides so that we can use system headers. #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include "common/system.h" #include "backends/updates/macosx/macosx-updates.h" #ifdef USE_SPARKLE @@ -32,6 +33,8 @@ #include <Cocoa/Cocoa.h> #include <Sparkle/Sparkle.h> +#include <AvailabilityMacros.h> + SUUpdater *sparkleUpdater; /** @@ -46,14 +49,22 @@ SUUpdater *sparkleUpdater; * */ MacOSXUpdateManager::MacOSXUpdateManager() { + NSBundle* mainBundle = [NSBundle mainBundle]; + + NSString *version = [mainBundle objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleVersionKey]; + if (!version || [version isEqualToString:@""]) { + warning("Running not in bundle, skipping Sparkle initialization"); + + sparkleUpdater = nullptr; + return; + } + NSMenuItem *menuItem = [[NSApp mainMenu] itemAtIndex:0]; NSMenu *applicationMenu = [menuItem submenu]; // Init Sparkle sparkleUpdater = [SUUpdater sharedUpdater]; - NSBundle* mainBundle = [NSBundle mainBundle]; - NSString* feedbackURL = [mainBundle objectForInfoDictionaryKey:@"SUFeedURL"]; // Set appcast URL @@ -89,6 +100,9 @@ MacOSXUpdateManager::~MacOSXUpdateManager() { } void MacOSXUpdateManager::checkForUpdates() { + if (sparkleUpdater == nullptr) + return; + [sparkleUpdater checkForUpdatesInBackground]; } @@ -96,10 +110,16 @@ void MacOSXUpdateManager::setAutomaticallyChecksForUpdates(UpdateManager::Update if (state == kUpdateStateNotSupported) return; + if (sparkleUpdater == nullptr) + return; + [sparkleUpdater setAutomaticallyChecksForUpdates:(state == kUpdateStateEnabled ? YES : NO)]; } Common::UpdateManager::UpdateState MacOSXUpdateManager::getAutomaticallyChecksForUpdates() { + if (sparkleUpdater == nullptr) + return kUpdateStateDisabled; + if ([sparkleUpdater automaticallyChecksForUpdates]) return kUpdateStateEnabled; else @@ -107,6 +127,9 @@ Common::UpdateManager::UpdateState MacOSXUpdateManager::getAutomaticallyChecksFo } void MacOSXUpdateManager::setUpdateCheckInterval(int interval) { + if (sparkleUpdater == nullptr) + return; + if (interval == kUpdateIntervalNotSupported) return; @@ -116,6 +139,9 @@ void MacOSXUpdateManager::setUpdateCheckInterval(int interval) { } int MacOSXUpdateManager::getUpdateCheckInterval() { + if (sparkleUpdater == nullptr) + return kUpdateIntervalOneDay; + // 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) @@ -133,4 +159,30 @@ int MacOSXUpdateManager::getUpdateCheckInterval() { } } +bool MacOSXUpdateManager::getLastUpdateCheckTimeAndDate(TimeDate &t) { + if (sparkleUpdater == nullptr) + return false; + + NSDate *date = [sparkleUpdater lastUpdateCheckDate]; +#ifdef MAC_OS_X_VERSION_10_10 + NSCalendar *gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]; + NSDateComponents *components = [gregorian components:(NSCalendarUnitDay | NSCalendarUnitWeekday) fromDate:date]; +#else + NSCalendar *gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]; + NSDateComponents *components = [gregorian components:(NSDayCalendarUnit | NSWeekdayCalendarUnit) fromDate:date]; +#endif + + t.tm_wday = [components weekday]; + t.tm_year = [components year]; + t.tm_mon = [components month]; + t.tm_mday = [components day]; + t.tm_hour = [components hour]; + t.tm_min = [components minute]; + t.tm_sec = [components second]; + + [gregorian release]; + + return true; +} + #endif diff --git a/common/updates.cpp b/common/updates.cpp index 4174a96c56..087002a7d3 100644 --- a/common/updates.cpp +++ b/common/updates.cpp @@ -42,7 +42,7 @@ int UpdateManager::normalizeInterval(int interval) { const int *val = updateIntervals; while (*val != -1) { - if (*val > interval) + if (*val >= interval) return *val; val++; } diff --git a/common/updates.h b/common/updates.h index 65eb5ac095..3a3049d4df 100644 --- a/common/updates.h +++ b/common/updates.h @@ -95,6 +95,14 @@ public: virtual int getUpdateCheckInterval() { return kUpdateIntervalNotSupported; } /** + * Gets last update check time + * + * @param t TimeDate struct to fill out + * @return flag indicating success + */ + virtual bool getLastUpdateCheckTimeAndDate(TimeDate &t) { return false; } + + /** * Returns list of supported uptate intervals. * Ending with '-1' which is not acceptable value. * @@ -2360,7 +2360,7 @@ case $_host_os in echo "Could not determine prefix for static libraries" fi fi - + # If _xcodetoolspath is not set yet use xcode-select to get the path if test -z "$_xcodetoolspath"; then _xcodetoolspath=`xcode-select -print-path`/Tools @@ -2730,21 +2730,19 @@ if test -n "$_host"; then gcw0) _sysroot=`$CXX --print-sysroot` _sdlpath=$_sysroot/usr/bin - append_var DEFINES "-DDINGUX -DGCW0" + append_var DEFINES "-DDINGUX -DGCW0 -DGUI_ONLY_FULLSCREEN" append_var DEFINES "-DREDUCE_MEMORY_USAGE" append_var CXXFLAGS "-mips32" _backend="dingux" + _alsa=no _mt32emu=no + _seq_midi=no + _timidity=no + _build_scalers=no _optimization_level=-O3 - # Disable alsa midi to get the port build on OpenDingux toolchain - _alsa=no _vkeybd=yes - _build_hq_scalers=no _keymapper=yes - # Force disable vorbis on dingux, it has terrible performance compared to tremor _vorbis=no - # Force disable seq on dingux, no way to use it and it would get enabled by default with configure - _seq_midi=no _port_mk="backends/platform/dingux/dingux.mk" ;; gp2x) diff --git a/dists/gcw0/scummvm.sh b/dists/gcw0/scummvm.sh index c12a3030cc..7e2bbaf23e 100755 --- a/dists/gcw0/scummvm.sh +++ b/dists/gcw0/scummvm.sh @@ -6,4 +6,4 @@ if [ ! -f $HOME/.scummvmrc ] ; then cp ./scummvmrc $HOME/.scummvmrc fi -exec ./scummvm +exec ./scummvm 2>&1 >/var/tmp/scummvm.log diff --git a/dists/macosx/scummvm_appcast.xml b/dists/macosx/scummvm_appcast.xml index a4a15a23f6..3d47c94bbc 100644 --- a/dists/macosx/scummvm_appcast.xml +++ b/dists/macosx/scummvm_appcast.xml @@ -2,7 +2,7 @@ <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> + <link>https://www.scummvm.org/appcasts/macosx/release.xml</link> <description>Most recent changes with links to updates.</description> <language>en</language> <item> @@ -24,6 +24,7 @@ <sparkle:releaseNotesLink> https://www.scummvm.org/frs/scummvm/1.7.0/ReleaseNotes </sparkle:releaseNotesLink> + <sparkle:version>1.7.0</sparkle:version> <pubDate>Tue, 29 Jul 2014 07:58:00 +0000</pubDate> <link>https://www.scummvm.org/frs/scummvm/1.7.0/</link> </item> diff --git a/doc/de/Neues b/doc/de/Neues index 73b4dc8d91..754bf0fe43 100644 --- a/doc/de/Neues +++ b/doc/de/Neues @@ -22,6 +22,15 @@ Programmcodes finden Sie auf Englisch unter: CinE: - Fehler beim Laden der Soundeffekte behoben. + Drascula: + - Text-Ausrichtung ist jetzt originalgetreu. + - Charakter tritt nicht mehr aus dem Bildschirmbereich heraus. + - Laden eines Spielstandes in der "Pendulum"-Szene repariert. + - Falscher Hintergrund fУМr Inventar-GegenstУЄnde im Kapitel 6 in der + spanischen Version korrigiert. + - Geschwindigkeit der Animationen korrigiert. Animationen wurden nur halb + so schnell wie im originalen Interpreter abgespielt. + Gob: - AufhУЄngen wУЄhrend Sound-Initialisierung in mehreren Spielen behoben. @@ -31,7 +40,19 @@ Programmcodes finden Sie auf Englisch unter: SAGA: - Fehlerhafte Farben der Bedienelemente in der franzУЖsischen und deutschen - Version von "I Have No Mouth and I Must Screm" korrigiert. + Version von "I Have No Mouth and I Must Scream" korrigiert. + + SCI: + - Cursor-Hilfsroutinen funktionieren nun korrekt auf OpenPandora und anderen + GerУЄten, die einen Touchscreen und analoge Sticks/MУЄuse zur gleichen Zeit + unterstУМtzen. + - Skript-Fehlerbehebung, um den fehlerhaften Endkampf in der mehrsprachigen + Version von King's Quest 5 zu korrigieren. Betroffen sind die franzУЖsische, + deutsche und spanische Version. + - UngУМltiger Speicherzugriff beim Laden der defekten Audiospur im Abspann + von King's Quest 5 behoben. + - Probleme mit der Einstellung der BildschirmauflУЖsung beim Speichern in + King's Quest 6 behoben. SCUMM: - Erkennung von Maniac Mansion innerhalb von Day of the Tentacle in der diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp index 38f544de4e..448f630501 100644 --- a/engines/access/sound.cpp +++ b/engines/access/sound.cpp @@ -20,9 +20,11 @@ * */ -#include "common/algorithm.h" #include "common/config-manager.h" #include "audio/mixer.h" +#include "audio/audiostream.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" #include "audio/decoders/raw.h" #include "audio/decoders/wave.h" // Miles Audio diff --git a/engines/access/sound.h b/engines/access/sound.h index b372e566d2..d82ee956b1 100644 --- a/engines/access/sound.h +++ b/engines/access/sound.h @@ -24,14 +24,16 @@ #define ACCESS_SOUND_H #include "common/scummsys.h" -#include "audio/audiostream.h" #include "audio/mixer.h" #include "access/files.h" #include "audio/midiplayer.h" -#include "audio/midiparser.h" #define MAX_SOUNDS 20 +namespace Audio { +class AudioStream; +} + namespace Access { class AccessEngine; diff --git a/engines/access/video/movie_decoder.h b/engines/access/video/movie_decoder.h index fe8a89fcde..8b5d94836b 100644 --- a/engines/access/video/movie_decoder.h +++ b/engines/access/video/movie_decoder.h @@ -23,13 +23,8 @@ #ifndef ACCESS_VIDEO_MOVIE_DECODER_H #define ACCESS_VIDEO_MOVIE_DECODER_H -#include "common/rect.h" #include "video/video_decoder.h" -#include "audio/decoders/raw.h" - -namespace Audio { -class QueuingAudioStream; -} +#include "audio/audiostream.h" namespace Common { class SeekableReadStream; diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp index 6e63cd3e71..e566ad12f6 100644 --- a/engines/agi/agi.cpp +++ b/engines/agi/agi.cpp @@ -37,7 +37,6 @@ #include "graphics/cursorman.h" #include "audio/mididrv.h" -#include "audio/mixer.h" #include "agi/agi.h" #include "agi/font.h" diff --git a/engines/agi/agi.h b/engines/agi/agi.h index b288557f57..1baf0d912f 100644 --- a/engines/agi/agi.h +++ b/engines/agi/agi.h @@ -43,8 +43,6 @@ #include "agi/logic.h" #include "agi/sound.h" -#include "gui/predictivedialog.h" - namespace Common { class RandomSource; } diff --git a/engines/agi/keyboard.cpp b/engines/agi/keyboard.cpp index 3bc45af5d4..7ed67949b5 100644 --- a/engines/agi/keyboard.cpp +++ b/engines/agi/keyboard.cpp @@ -21,6 +21,7 @@ */ #include "common/events.h" +#include "gui/predictivedialog.h" #include "agi/agi.h" #include "agi/graphics.h" diff --git a/engines/agi/preagi.cpp b/engines/agi/preagi.cpp index bb5d3b8896..7e2e65a3eb 100644 --- a/engines/agi/preagi.cpp +++ b/engines/agi/preagi.cpp @@ -20,16 +20,14 @@ * */ -#include "common/config-manager.h" +#include "audio/softsynth/pcspk.h" + #include "common/debug-channels.h" #include "common/events.h" #include "common/random.h" -#include "common/textconsole.h" #include "agi/preagi.h" #include "agi/graphics.h" -#include "agi/keyboard.h" -#include "agi/text.h" namespace Agi { diff --git a/engines/agi/preagi.h b/engines/agi/preagi.h index 289b5ecdb9..d6026a5d4d 100644 --- a/engines/agi/preagi.h +++ b/engines/agi/preagi.h @@ -25,7 +25,9 @@ #include "agi/agi.h" -#include "audio/softsynth/pcspk.h" +namespace Audio { +class PCSpeaker; +} namespace Agi { diff --git a/engines/agi/sound_midi.cpp b/engines/agi/sound_midi.cpp index f5c48b3b21..6998df6862 100644 --- a/engines/agi/sound_midi.cpp +++ b/engines/agi/sound_midi.cpp @@ -46,7 +46,6 @@ #include "common/file.h" #include "common/memstream.h" #include "common/stream.h" -#include "common/textconsole.h" #include "agi/agi.h" diff --git a/engines/agi/sound_sarien.cpp b/engines/agi/sound_sarien.cpp index c8a7042ea3..939c3d2c77 100644 --- a/engines/agi/sound_sarien.cpp +++ b/engines/agi/sound_sarien.cpp @@ -22,8 +22,6 @@ #include "common/random.h" -#include "audio/mididrv.h" - #include "agi/agi.h" #include "agi/sound_sarien.h" diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index 8952e649fd..48b170da75 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -32,6 +32,7 @@ #include "agos/intern.h" #include "agos/agos.h" #include "agos/midi.h" +#include "agos/sound.h" #include "backends/audiocd/audiocd.h" diff --git a/engines/agos/agos.h b/engines/agos/agos.h index b6b5e427e1..551df6e19b 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -32,8 +32,8 @@ #include "common/rect.h" #include "common/stack.h" #include "common/util.h" +#include "audio/mixer.h" -#include "agos/sound.h" #include "agos/vga.h" /** @@ -77,10 +77,14 @@ uint fileReadItemID(Common::SeekableReadStream *in); class MoviePlayer; #endif +class Sound; class MidiPlayer; struct Child; struct SubObject; +struct RoomState; +struct SubRoom; +struct SubSuperRoom; struct Item; struct WindowBlock; diff --git a/engines/agos/cursor.cpp b/engines/agos/cursor.cpp index 65fdc9ec99..19a38116cf 100644 --- a/engines/agos/cursor.cpp +++ b/engines/agos/cursor.cpp @@ -26,6 +26,7 @@ #include "graphics/cursorman.h" #include "agos/agos.h" +#include "agos/intern.h" namespace AGOS { diff --git a/engines/agos/debugger.cpp b/engines/agos/debugger.cpp index 7ad742c928..365d84dd3f 100644 --- a/engines/agos/debugger.cpp +++ b/engines/agos/debugger.cpp @@ -25,6 +25,7 @@ #include "agos/debugger.h" #include "agos/agos.h" #include "agos/midi.h" +#include "agos/sound.h" namespace AGOS { diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h index 793d4081cf..90e5a84829 100644 --- a/engines/agos/detection_tables.h +++ b/engines/agos/detection_tables.h @@ -2251,6 +2251,31 @@ static const AGOSGameDescription gameDescriptions[] = { GF_TALKIE }, + // Simon the Sorcerer 2 - Russian DOS CD + { + { + "simon2", + "CD", + + { + { "gsptr30", GAME_BASEFILE, "e26d162e573587f4601b88701292212c", 58851}, + { "icon.dat", GAME_ICONFILE, "72096a62d36e6034ea9fecc13b2dbdab", 18089}, + { "simon2.gme", GAME_GMEFILE, "9c535d403966750ae98bdaf698375a38", 19687892}, + { "stripped.txt", GAME_STRFILE, "e229f84d46fa83f99b4a7115679f3fb6", 171}, + { "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9", 513}, + { NULL, 0, NULL, 0} + }, + Common::RU_RUS, + Common::kPlatformDOS, + ADGF_CD, + GUIO0() + }, + + GType_SIMON2, + GID_SIMON2, + GF_TALKIE + }, + // Simon the Sorcerer 2 - Czech Windows CD { { diff --git a/engines/agos/drivers/accolade/adlib.cpp b/engines/agos/drivers/accolade/adlib.cpp index 294be2b8a7..3a95d8f1c1 100644 --- a/engines/agos/drivers/accolade/adlib.cpp +++ b/engines/agos/drivers/accolade/adlib.cpp @@ -20,16 +20,13 @@ * */ -#include "agos/agos.h" #include "agos/drivers/accolade/mididriver.h" -#include "common/file.h" -#include "common/mutex.h" #include "common/system.h" #include "common/textconsole.h" #include "audio/fmopl.h" -#include "audio/softsynth/emumidi.h" +#include "audio/mididrv.h" namespace AGOS { diff --git a/engines/agos/drivers/accolade/driverfile.cpp b/engines/agos/drivers/accolade/driverfile.cpp index 4ff2fd550f..1e7fd442df 100644 --- a/engines/agos/drivers/accolade/driverfile.cpp +++ b/engines/agos/drivers/accolade/driverfile.cpp @@ -20,7 +20,6 @@ * */ -#include "agos/agos.h" #include "audio/mididrv.h" #include "common/error.h" #include "common/file.h" diff --git a/engines/agos/drivers/accolade/mt32.cpp b/engines/agos/drivers/accolade/mt32.cpp index 319e0ebf56..321b95f4ca 100644 --- a/engines/agos/drivers/accolade/mt32.cpp +++ b/engines/agos/drivers/accolade/mt32.cpp @@ -20,7 +20,6 @@ * */ -#include "agos/agos.h" #include "agos/drivers/accolade/mididriver.h" #include "audio/mididrv.h" diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp index 5240cdd771..b70ec674dd 100644 --- a/engines/agos/event.cpp +++ b/engines/agos/event.cpp @@ -23,6 +23,7 @@ #include "agos/agos.h" #include "agos/animation.h" #include "agos/debugger.h" +#include "agos/sound.h" #include "agos/intern.h" #include "common/events.h" diff --git a/engines/agos/icons.cpp b/engines/agos/icons.cpp index 2db2a52cbc..364fbf5f15 100644 --- a/engines/agos/icons.cpp +++ b/engines/agos/icons.cpp @@ -27,6 +27,7 @@ #include "graphics/surface.h" #include "agos/agos.h" +#include "agos/intern.h" namespace AGOS { diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp index 686b1c35b2..3b57369f1e 100644 --- a/engines/agos/input.cpp +++ b/engines/agos/input.cpp @@ -26,6 +26,7 @@ #include "agos/intern.h" #include "agos/agos.h" #include "agos/midi.h" +#include "agos/sound.h" #include "agos/vga.h" namespace AGOS { diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp index 2631f7998e..76d23905b7 100644 --- a/engines/agos/res.cpp +++ b/engines/agos/res.cpp @@ -31,7 +31,6 @@ #include "agos/agos.h" #include "agos/intern.h" -#include "agos/sound.h" #include "common/zlib.h" diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp index 3a092e652c..81d89cc4d3 100644 --- a/engines/agos/res_snd.cpp +++ b/engines/agos/res_snd.cpp @@ -28,6 +28,7 @@ #include "agos/intern.h" #include "agos/agos.h" #include "agos/midi.h" +#include "agos/sound.h" #include "agos/vga.h" #include "backends/audiocd/audiocd.h" diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp index b968ae645c..66a7fa90b3 100644 --- a/engines/agos/saveload.cpp +++ b/engines/agos/saveload.cpp @@ -25,7 +25,6 @@ #include "common/textconsole.h" #include "common/translation.h" -#include "gui/about.h" #include "gui/message.h" #include "agos/agos.h" diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp index 1dbb9c255a..5f4ff4e773 100644 --- a/engines/agos/script.cpp +++ b/engines/agos/script.cpp @@ -27,8 +27,8 @@ #include "common/system.h" #include "common/textconsole.h" -#include "agos/animation.h" #include "agos/agos.h" +#include "agos/intern.h" #ifdef _WIN32_WCE extern bool isSmartphone(); diff --git a/engines/agos/script_e1.cpp b/engines/agos/script_e1.cpp index a022335ebc..38b29d475e 100644 --- a/engines/agos/script_e1.cpp +++ b/engines/agos/script_e1.cpp @@ -22,6 +22,7 @@ #include "agos/agos.h" +#include "agos/intern.h" #include "agos/vga.h" namespace AGOS { diff --git a/engines/agos/script_e2.cpp b/engines/agos/script_e2.cpp index 21b651ec12..d0cd015ce9 100644 --- a/engines/agos/script_e2.cpp +++ b/engines/agos/script_e2.cpp @@ -23,6 +23,7 @@ #include "agos/agos.h" +#include "agos/intern.h" namespace AGOS { diff --git a/engines/agos/script_ff.cpp b/engines/agos/script_ff.cpp index e4fadcf360..10c9e995d4 100644 --- a/engines/agos/script_ff.cpp +++ b/engines/agos/script_ff.cpp @@ -28,6 +28,8 @@ #include "agos/animation.h" #include "agos/agos.h" +#include "agos/intern.h" +#include "agos/sound.h" namespace AGOS { diff --git a/engines/agos/script_pn.cpp b/engines/agos/script_pn.cpp index 60948db35a..653a162904 100644 --- a/engines/agos/script_pn.cpp +++ b/engines/agos/script_pn.cpp @@ -21,6 +21,7 @@ */ #include "agos/agos.h" +#include "agos/intern.h" #include "agos/vga.h" #include "common/endian.h" diff --git a/engines/agos/script_s1.cpp b/engines/agos/script_s1.cpp index ec3de9bf94..e7828609d9 100644 --- a/engines/agos/script_s1.cpp +++ b/engines/agos/script_s1.cpp @@ -26,6 +26,8 @@ #include "graphics/palette.h" #include "agos/agos.h" +#include "agos/intern.h" +#include "agos/sound.h" #ifdef _WIN32_WCE extern bool isSmartphone(); diff --git a/engines/agos/script_s2.cpp b/engines/agos/script_s2.cpp index 44552ecd8a..7b1f369d68 100644 --- a/engines/agos/script_s2.cpp +++ b/engines/agos/script_s2.cpp @@ -23,6 +23,7 @@ #include "agos/agos.h" +#include "agos/intern.h" #include "agos/midi.h" #include "common/textconsole.h" diff --git a/engines/agos/script_ww.cpp b/engines/agos/script_ww.cpp index aff3229f8e..9394311001 100644 --- a/engines/agos/script_ww.cpp +++ b/engines/agos/script_ww.cpp @@ -23,6 +23,7 @@ #include "agos/agos.h" +#include "agos/intern.h" namespace AGOS { diff --git a/engines/agos/string.cpp b/engines/agos/string.cpp index 3eb0aca04d..4f6c62c48a 100644 --- a/engines/agos/string.cpp +++ b/engines/agos/string.cpp @@ -25,7 +25,6 @@ #include "common/file.h" #include "common/textconsole.h" -#include "gui/about.h" #include "gui/message.h" #include "agos/agos.h" diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp index 1e6ecaa829..0f6c767300 100644 --- a/engines/agos/subroutine.cpp +++ b/engines/agos/subroutine.cpp @@ -26,6 +26,7 @@ #include "agos/agos.h" #include "agos/intern.h" +#include "agos/sound.h" namespace AGOS { diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp index f761c3fc3f..2a675bf6e8 100644 --- a/engines/agos/vga.cpp +++ b/engines/agos/vga.cpp @@ -25,6 +25,7 @@ #include "agos/agos.h" #include "agos/intern.h" +#include "agos/sound.h" #include "agos/vga.h" #include "common/debug-channels.h" diff --git a/engines/agos/vga_e2.cpp b/engines/agos/vga_e2.cpp index bc26058640..a26f189c43 100644 --- a/engines/agos/vga_e2.cpp +++ b/engines/agos/vga_e2.cpp @@ -25,6 +25,7 @@ #include "agos/agos.h" #include "agos/intern.h" +#include "agos/sound.h" #include "common/endian.h" #include "common/system.h" diff --git a/engines/agos/vga_ff.cpp b/engines/agos/vga_ff.cpp index 52e30699b0..c350c37413 100644 --- a/engines/agos/vga_ff.cpp +++ b/engines/agos/vga_ff.cpp @@ -26,6 +26,7 @@ #include "agos/agos.h" #include "agos/intern.h" +#include "agos/sound.h" namespace AGOS { diff --git a/engines/agos/vga_s1.cpp b/engines/agos/vga_s1.cpp index c5f0f7874d..9b7e529e4b 100644 --- a/engines/agos/vga_s1.cpp +++ b/engines/agos/vga_s1.cpp @@ -24,6 +24,7 @@ #include "agos/agos.h" #include "agos/intern.h" +#include "agos/sound.h" #include "agos/vga.h" namespace AGOS { diff --git a/engines/agos/vga_s2.cpp b/engines/agos/vga_s2.cpp index 0c716d06c4..5326e0250f 100644 --- a/engines/agos/vga_s2.cpp +++ b/engines/agos/vga_s2.cpp @@ -23,6 +23,7 @@ #include "agos/agos.h" #include "agos/intern.h" #include "agos/midi.h" +#include "agos/sound.h" #include "graphics/surface.h" diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp index 451b4a1c68..6946e448d8 100644 --- a/engines/avalanche/animation.cpp +++ b/engines/avalanche/animation.cpp @@ -27,6 +27,7 @@ /* TRIP5 Trippancy V - the sprite animation subsystem */ +#include "common/system.h" #include "avalanche/avalanche.h" #include "avalanche/animation.h" diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp index 6cfe4dfdb6..8726ef784a 100644 --- a/engines/avalanche/avalanche.cpp +++ b/engines/avalanche/avalanche.cpp @@ -29,6 +29,7 @@ #include "common/random.h" #include "common/savefile.h" +#include "common/system.h" #include "graphics/thumbnail.h" namespace Avalanche { diff --git a/engines/avalanche/clock.cpp b/engines/avalanche/clock.cpp index 6d398d9921..4276e41d99 100644 --- a/engines/avalanche/clock.cpp +++ b/engines/avalanche/clock.cpp @@ -28,6 +28,8 @@ #include "avalanche/clock.h" #include "avalanche/avalanche.h" +#include "common/system.h" + namespace Avalanche { Clock::Clock(AvalancheEngine *vm) { diff --git a/engines/avalanche/dialogs.cpp b/engines/avalanche/dialogs.cpp index f95440900b..d1a7234b03 100644 --- a/engines/avalanche/dialogs.cpp +++ b/engines/avalanche/dialogs.cpp @@ -30,6 +30,7 @@ #include "avalanche/avalanche.h" #include "avalanche/dialogs.h" +#include "common/system.h" #include "common/random.h" namespace Avalanche { diff --git a/engines/avalanche/ghostroom.cpp b/engines/avalanche/ghostroom.cpp index 047a3670c2..254bf5e174 100644 --- a/engines/avalanche/ghostroom.cpp +++ b/engines/avalanche/ghostroom.cpp @@ -29,6 +29,7 @@ #include "avalanche/ghostroom.h" #include "common/random.h" +#include "common/system.h" namespace Avalanche { diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp index 60c23594d3..03c9e9e3cb 100644 --- a/engines/avalanche/graphics.cpp +++ b/engines/avalanche/graphics.cpp @@ -28,6 +28,7 @@ #include "avalanche/avalanche.h" #include "avalanche/graphics.h" +#include "common/system.h" #include "engines/util.h" #include "graphics/palette.h" diff --git a/engines/avalanche/highscore.cpp b/engines/avalanche/highscore.cpp index 5f47aeb894..b977e2f33c 100644 --- a/engines/avalanche/highscore.cpp +++ b/engines/avalanche/highscore.cpp @@ -29,6 +29,7 @@ #include "avalanche/highscore.h" #include "common/savefile.h" +#include "common/system.h" namespace Avalanche { diff --git a/engines/avalanche/mainmenu.cpp b/engines/avalanche/mainmenu.cpp index 543684556c..ff24b37e0d 100644 --- a/engines/avalanche/mainmenu.cpp +++ b/engines/avalanche/mainmenu.cpp @@ -28,6 +28,8 @@ #include "avalanche/avalanche.h" #include "avalanche/mainmenu.h" +#include "common/system.h" + namespace Avalanche { MainMenu::MainMenu(AvalancheEngine *vm) { diff --git a/engines/avalanche/nim.cpp b/engines/avalanche/nim.cpp index b17af8767a..a0a1756e0a 100644 --- a/engines/avalanche/nim.cpp +++ b/engines/avalanche/nim.cpp @@ -28,6 +28,8 @@ #include "avalanche/avalanche.h" #include "avalanche/nim.h" +#include "common/system.h" + namespace Avalanche { const char * const Nim::kNames[2] = {"Avalot", "Dogfood"}; diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp index 7c6d254099..112dce93ac 100644 --- a/engines/avalanche/parser.cpp +++ b/engines/avalanche/parser.cpp @@ -30,6 +30,7 @@ #include "avalanche/nim.h" #include "gui/saveload.h" +#include "common/system.h" #include "common/translation.h" namespace Avalanche { diff --git a/engines/avalanche/shootemup.cpp b/engines/avalanche/shootemup.cpp index e5e44ed934..7f6cf99974 100644 --- a/engines/avalanche/shootemup.cpp +++ b/engines/avalanche/shootemup.cpp @@ -29,6 +29,7 @@ #include "avalanche/shootemup.h" #include "common/random.h" +#include "common/system.h" namespace Avalanche { diff --git a/engines/avalanche/sound.cpp b/engines/avalanche/sound.cpp index 0223bead48..a441121e90 100644 --- a/engines/avalanche/sound.cpp +++ b/engines/avalanche/sound.cpp @@ -23,7 +23,7 @@ #include "avalanche/avalanche.h" #include "avalanche/sound.h" -#include "audio/audiostream.h" +#include "audio/softsynth/pcspk.h" #include "common/config-manager.h" namespace Avalanche { diff --git a/engines/avalanche/sound.h b/engines/avalanche/sound.h index a67016a206..f9775654b4 100644 --- a/engines/avalanche/sound.h +++ b/engines/avalanche/sound.h @@ -24,7 +24,10 @@ #define AVALANCHE_SOUND_H #include "audio/mixer.h" -#include "audio/softsynth/pcspk.h" + +namespace Audio { +class PCSpeaker; +} namespace Avalanche { diff --git a/engines/bbvs/bbvs.cpp b/engines/bbvs/bbvs.cpp index 6ae663479d..e7b20512a2 100644 --- a/engines/bbvs/bbvs.cpp +++ b/engines/bbvs/bbvs.cpp @@ -34,6 +34,7 @@ #include "bbvs/minigames/minigame.h" #include "audio/audiostream.h" +#include "audio/decoders/aiff.h" #include "common/config-manager.h" #include "common/debug-channels.h" #include "common/error.h" diff --git a/engines/bbvs/bbvs.h b/engines/bbvs/bbvs.h index ff4afe9526..8d9550d423 100644 --- a/engines/bbvs/bbvs.h +++ b/engines/bbvs/bbvs.h @@ -24,7 +24,6 @@ #define BBVS_BBVS_H #include "audio/mixer.h" -#include "audio/decoders/aiff.h" #include "common/array.h" #include "common/events.h" #include "common/file.h" diff --git a/engines/bbvs/dialogs.cpp b/engines/bbvs/dialogs.cpp index c8470f8eef..1609794c73 100644 --- a/engines/bbvs/dialogs.cpp +++ b/engines/bbvs/dialogs.cpp @@ -22,10 +22,13 @@ #include "bbvs/dialogs.h" #include "common/events.h" -#include "gui/gui-manager.h" -#include "gui/ThemeEval.h" +#include "gui/widget.h" #include "engines/advancedDetector.h" +namespace GUI { +class CommandSender; +} + namespace Bbvs { struct MenuButton { diff --git a/engines/bbvs/dialogs.h b/engines/bbvs/dialogs.h index 7db0b182b7..af1f70e9a7 100644 --- a/engines/bbvs/dialogs.h +++ b/engines/bbvs/dialogs.h @@ -25,7 +25,11 @@ #include "bbvs/bbvs.h" #include "gui/dialog.h" -#include "gui/widgets/edittext.h" + +namespace GUI { +class ButtonWidget; +class CommandSender; +} namespace Bbvs { diff --git a/engines/bbvs/minigames/bbairguitar.cpp b/engines/bbvs/minigames/bbairguitar.cpp index 04175f7290..f826667134 100644 --- a/engines/bbvs/minigames/bbairguitar.cpp +++ b/engines/bbvs/minigames/bbairguitar.cpp @@ -25,7 +25,6 @@ #include "common/savefile.h" #include "common/translation.h" -#include "gui/dialog.h" #include "gui/message.h" #include "gui/filebrowser-dialog.h" diff --git a/engines/bbvs/sound.cpp b/engines/bbvs/sound.cpp index 7f9c00ad48..587868f26d 100644 --- a/engines/bbvs/sound.cpp +++ b/engines/bbvs/sound.cpp @@ -21,6 +21,7 @@ */ #include "bbvs/sound.h" +#include "audio/audiostream.h" #include "audio/decoders/aiff.h" #include "common/debug.h" #include "common/file.h" diff --git a/engines/bbvs/sound.h b/engines/bbvs/sound.h index 4d3253c48e..a21d97b7ed 100644 --- a/engines/bbvs/sound.h +++ b/engines/bbvs/sound.h @@ -23,10 +23,13 @@ #ifndef BBVS_SOUND_H #define BBVS_SOUND_H -#include "audio/audiostream.h" #include "audio/mixer.h" #include "common/array.h" +namespace Audio { +class RewindableAudioStream; +} + namespace Bbvs { class Sound { diff --git a/engines/cge/events.cpp b/engines/cge/events.cpp index c2f8982592..5d3d0a16a0 100644 --- a/engines/cge/events.cpp +++ b/engines/cge/events.cpp @@ -26,8 +26,6 @@ */ #include "gui/saveload.h" -#include "gui/about.h" -#include "gui/message.h" #include "common/config-manager.h" #include "common/events.h" #include "common/translation.h" diff --git a/engines/cge/sound.cpp b/engines/cge/sound.cpp index 370b768bca..3af094ef06 100644 --- a/engines/cge/sound.cpp +++ b/engines/cge/sound.cpp @@ -30,8 +30,10 @@ #include "cge/cge_main.h" #include "common/config-manager.h" #include "common/memstream.h" -#include "audio/decoders/raw.h" #include "audio/audiostream.h" +#include "audio/decoders/wave.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" namespace CGE { diff --git a/engines/cge/sound.h b/engines/cge/sound.h index dc67f9408b..8e624ee575 100644 --- a/engines/cge/sound.h +++ b/engines/cge/sound.h @@ -29,15 +29,14 @@ #define CGE_SOUND_H #include "cge/fileio.h" -#include "audio/audiostream.h" -#include "audio/decoders/wave.h" -#include "audio/fmopl.h" -#include "audio/mididrv.h" -#include "audio/midiparser.h" #include "audio/midiplayer.h" #include "audio/mixer.h" #include "common/memstream.h" +namespace Audio { +class RewindableAudioStream; +} + namespace CGE { class CGEEngine; diff --git a/engines/cge2/events.cpp b/engines/cge2/events.cpp index 96cecc8e23..2dac04a0a5 100644 --- a/engines/cge2/events.cpp +++ b/engines/cge2/events.cpp @@ -26,8 +26,6 @@ */ #include "gui/saveload.h" -#include "gui/about.h" -#include "gui/message.h" #include "common/config-manager.h" #include "common/events.h" #include "common/translation.h" diff --git a/engines/cge2/saveload.cpp b/engines/cge2/saveload.cpp index 7735c077a6..cd0be84567 100644 --- a/engines/cge2/saveload.cpp +++ b/engines/cge2/saveload.cpp @@ -25,7 +25,7 @@ * Copyright (c) 1994-1997 Janus B. Wisniewski and L.K. Avalon */ -#include "common/config-manager.h" +#include "common/memstream.h" #include "common/savefile.h" #include "common/system.h" #include "graphics/thumbnail.h" @@ -36,8 +36,6 @@ #include "cge2/snail.h" #include "cge2/hero.h" #include "cge2/text.h" -#include "cge2/sound.h" -#include "cge2/cge2_main.h" namespace CGE2 { diff --git a/engines/cge2/sound.cpp b/engines/cge2/sound.cpp index 57ec5983e8..691414d84a 100644 --- a/engines/cge2/sound.cpp +++ b/engines/cge2/sound.cpp @@ -26,10 +26,11 @@ */ #include "cge2/sound.h" -#include "common/config-manager.h" #include "common/memstream.h" -#include "audio/decoders/raw.h" #include "audio/audiostream.h" +#include "audio/decoders/wave.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" #include "cge2/cge2.h" namespace CGE2 { diff --git a/engines/cge2/sound.h b/engines/cge2/sound.h index 02afe610a2..8c16f06e97 100644 --- a/engines/cge2/sound.h +++ b/engines/cge2/sound.h @@ -28,19 +28,17 @@ #ifndef CGE2_SOUND_H #define CGE2_SOUND_H -#include "cge2/fileio.h" -#include "audio/audiostream.h" -#include "audio/decoders/wave.h" -#include "audio/fmopl.h" -#include "audio/mididrv.h" -#include "audio/midiparser.h" #include "audio/midiplayer.h" #include "audio/mixer.h" -#include "common/memstream.h" + +namespace Audio { +class RewindableAudioStream; +} namespace CGE2 { class CGE2Engine; +class EncryptedStream; // sample info struct SmpInfo { diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp index f070338978..73d97e100d 100644 --- a/engines/composer/composer.cpp +++ b/engines/composer/composer.cpp @@ -21,13 +21,9 @@ */ #include "common/scummsys.h" -#include "common/config-manager.h" #include "common/events.h" -#include "common/file.h" #include "common/random.h" -#include "common/fs.h" #include "common/keyboard.h" -#include "common/substream.h" #include "graphics/cursorman.h" #include "graphics/surface.h" @@ -35,9 +31,6 @@ #include "graphics/wincursor.h" #include "engines/util.h" -#include "engines/advancedDetector.h" - -#include "audio/audiostream.h" #include "composer/composer.h" #include "composer/graphics.h" diff --git a/engines/composer/composer.h b/engines/composer/composer.h index 47398fe36d..234494e655 100644 --- a/engines/composer/composer.h +++ b/engines/composer/composer.h @@ -28,6 +28,7 @@ #include "common/system.h" #include "common/debug.h" #include "common/debug-channels.h" +#include "common/error.h" #include "common/textconsole.h" #include "common/rect.h" diff --git a/engines/cruise/sound.cpp b/engines/cruise/sound.cpp index f57435f4f7..b477dcdf9c 100644 --- a/engines/cruise/sound.cpp +++ b/engines/cruise/sound.cpp @@ -29,10 +29,11 @@ #include "cruise/sound.h" #include "cruise/volume.h" -#include "audio/audiostream.h" #include "audio/fmopl.h" -#include "audio/mixer.h" -#include "audio/mods/soundfx.h" + +namespace Audio { +class Mixer; +} namespace Cruise { diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp index 8498e50b8d..a21a4a8126 100644 --- a/engines/dialogs.cpp +++ b/engines/dialogs.cpp @@ -43,13 +43,13 @@ #include "engines/engine.h" #include "engines/metaengine.h" -#ifdef SMALL_SCREEN_DEVICE +#ifdef GUI_ENABLE_KEYSDIALOG #include "gui/KeysDialog.h" #endif class ConfigDialog : public GUI::OptionsDialog { protected: -#ifdef SMALL_SCREEN_DEVICE +#ifdef GUI_ENABLE_KEYSDIALOG GUI::Dialog *_keysDialog; #endif @@ -307,14 +307,14 @@ ConfigDialog::ConfigDialog(bool subtitleControls) new GUI::ButtonWidget(this, "GlobalConfig.Ok", _("~O~K"), 0, GUI::kOKCmd); new GUI::ButtonWidget(this, "GlobalConfig.Cancel", _("~C~ancel"), 0, GUI::kCloseCmd); -#ifdef SMALL_SCREEN_DEVICE +#ifdef GUI_ENABLE_KEYSDIALOG new GUI::ButtonWidget(this, "GlobalConfig.Keys", _("~K~eys"), 0, kKeysCmd); _keysDialog = NULL; #endif } ConfigDialog::~ConfigDialog() { -#ifdef SMALL_SCREEN_DEVICE +#ifdef GUI_ENABLE_KEYSDIALOG delete _keysDialog; #endif } @@ -323,7 +323,7 @@ void ConfigDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 switch (cmd) { case kKeysCmd: -#ifdef SMALL_SCREEN_DEVICE +#ifdef GUI_ENABLE_KEYSDIALOG // // Create the sub dialog(s) // diff --git a/engines/draci/music.cpp b/engines/draci/music.cpp index cda2007a8e..3fa380196a 100644 --- a/engines/draci/music.cpp +++ b/engines/draci/music.cpp @@ -22,10 +22,8 @@ // MIDI and digital music class -#include "audio/audiostream.h" #include "audio/mididrv.h" #include "audio/midiparser.h" -#include "common/config-manager.h" #include "common/debug.h" #include "common/file.h" diff --git a/engines/drascula/actors.cpp b/engines/drascula/actors.cpp index 849e2ccd24..b459c4539b 100644 --- a/engines/drascula/actors.cpp +++ b/engines/drascula/actors.cpp @@ -123,6 +123,8 @@ void DrasculaEngine::startWalking() { walkUp(); else if (roomY > curY + curHeight) walkDown(); + else + characterMoved = 0; } else { if ((roomX < curX + curWidth / 2 ) && (roomY <= (curY + curHeight))) quadrant_1(); @@ -189,7 +191,7 @@ void DrasculaEngine::moveCharacters() { } if (currentChapter != 2 && currentChapter != 3) { - if (hare_se_ve == 0) { + if (characterVisible == 0) { increaseFrameNum(); return; } diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp index 5009a62e84..f672ad3b55 100644 --- a/engines/drascula/animation.cpp +++ b/engines/drascula/animation.cpp @@ -360,7 +360,7 @@ void DrasculaEngine::animation_2_1() { int l; gotoObject(231, 91); - hare_se_ve = 0; + characterVisible = 0; term_int = 0; @@ -433,7 +433,7 @@ void DrasculaEngine::animation_2_1() { curX = 91; curY = 95; trackProtagonist = 1; - hare_se_ve = 1; + characterVisible = 1; loadPic("97g.alg", extraSurface); if (animate("lev.bin", 15)) @@ -1434,7 +1434,7 @@ void DrasculaEngine::animation_12_5() { doBreak = 1; previousMusic = roomMusic; - hare_se_ve = 1; + characterVisible = 1; clearRoom(); trackProtagonist = 1; characterMoved = 0; @@ -1504,6 +1504,7 @@ void DrasculaEngine::animation_14_5() { void DrasculaEngine::animation_1_6() { debug(4, "animation_1_6()"); + hideCursor(); trackProtagonist = 0; curX = 103; curY = 108; @@ -1543,7 +1544,7 @@ void DrasculaEngine::animation_1_6() { updateEvents(); clearRoom(); black(); - hare_se_ve = 0; + characterVisible = 0; flags[0] = 0; updateRoom(); updateScreen(); @@ -1618,7 +1619,7 @@ void DrasculaEngine::animation_6_6() { curX = -1; selectVerb(kVerbNone); enterRoom(58); - hare_se_ve = 1; + characterVisible = 1; trackProtagonist = 1; animate("hbp.bin", 14); @@ -2138,7 +2139,7 @@ void DrasculaEngine::animation_5_4(){ loadPic("anh_dr.alg", backSurface); gotoObject(99, 160); gotoObject(38, 177); - hare_se_ve = 0; + characterVisible = 0; updateRoom(); updateScreen(); delay(800); @@ -2156,7 +2157,7 @@ void DrasculaEngine::animation_5_4(){ talk_igor(30, kIgorFront); loadPic(96, frontSurface); loadPic(99, backSurface); - hare_se_ve = 1; + characterVisible = 1; fadeToBlack(0); exitRoom(0); } @@ -2211,7 +2212,7 @@ void DrasculaEngine::activatePendulum() { debug(4, "activatePendulum()"); flags[1] = 2; - hare_se_ve = 0; + characterVisible = 0; _roomNumber = 102; loadPic(102, bgSurface, HALF_PAL); loadPic("an_p1.alg", drawSurface3); diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp index 9ac9031fb7..d7b1fd6acd 100644 --- a/engines/drascula/drascula.cpp +++ b/engines/drascula/drascula.cpp @@ -23,19 +23,13 @@ #include "common/events.h" #include "common/keyboard.h" #include "common/file.h" -#include "common/savefile.h" #include "common/config-manager.h" #include "common/textconsole.h" #include "backends/audiocd/audiocd.h" -#include "base/plugins.h" -#include "base/version.h" - #include "engines/util.h" -#include "audio/mixer.h" - #include "drascula/drascula.h" #include "drascula/console.h" @@ -144,7 +138,7 @@ DrasculaEngine::DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gam curDirection = 0; trackProtagonist = 0; _characterFrame = 0; - hare_se_ve = 0; + characterVisible = 0; roomX = 0; roomY = 0; checkFlags = 0; @@ -299,7 +293,7 @@ Common::Error DrasculaEngine::run() { characterMoved = 0; trackProtagonist = 3; _characterFrame = 0; - hare_se_ve = 1; + characterVisible = 1; checkFlags = 1; doBreak = 0; walkToObject = 0; @@ -365,7 +359,7 @@ Common::Error DrasculaEngine::run() { for (i = 0; i < 25; i++) memcpy(crosshairCursor + i * 40, tableSurface + 225 + (56 + i) * 320, 40); - if (_lang == kSpanish) + if (_lang == kSpanish && currentChapter != 6) loadPic(974, tableSurface); if (currentChapter != 2) { @@ -897,7 +891,7 @@ void DrasculaEngine::pause(int duration) { } int DrasculaEngine::getTime() { - return _system->getMillis() / 20; // originally was 1 + return _system->getMillis() / 10; } void DrasculaEngine::reduce_hare_chico(int xx1, int yy1, int xx2, int yy2, int width, int height, int factor, byte *dir_inicio, byte *dir_fin) { diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h index 762add50a5..acca2e5915 100644 --- a/engines/drascula/drascula.h +++ b/engines/drascula/drascula.h @@ -429,7 +429,7 @@ public: int frame_y; int curX, curY, characterMoved, curDirection, trackProtagonist, _characterFrame; - int hare_se_ve; // TODO: what is this for? + int characterVisible; int roomX, roomY, checkFlags; int doBreak; int stepX, stepY; diff --git a/engines/drascula/graphics.cpp b/engines/drascula/graphics.cpp index 077047a6eb..6bfb2e1823 100644 --- a/engines/drascula/graphics.cpp +++ b/engines/drascula/graphics.cpp @@ -217,6 +217,10 @@ void DrasculaEngine::print_abc(const char *said, int screenX, int screenY) { int letterY = 0, letterX = 0, i; uint len = strlen(said); byte c; + + byte *srcSurface = tableSurface; + if (_lang == kSpanish && currentChapter == 6) + srcSurface = extraSurface; for (uint h = 0; h < len; h++) { c = toupper(said[h]); @@ -241,7 +245,7 @@ void DrasculaEngine::print_abc(const char *said, int screenX, int screenY) { } // for copyRect(letterX, letterY, screenX, screenY, - CHAR_WIDTH, CHAR_HEIGHT, tableSurface, screenSurface); + CHAR_WIDTH, CHAR_HEIGHT, srcSurface, screenSurface); screenX = screenX + CHAR_WIDTH; if (screenX > 317) { @@ -319,28 +323,51 @@ int DrasculaEngine::print_abc_opc(const char *said, int screenY, int game) { } bool DrasculaEngine::textFitsCentered(char *text, int x) { - int len = strlen(text); - int tmp = CLIP<int>(x - len * CHAR_WIDTH / 2, 60, 255); - return (tmp + len * CHAR_WIDTH) <= 320; + int textLen = strlen(text); + int halfLen = (textLen / 2) * CHAR_WIDTH; + + //if (x > 160) + // x = 315 - x; + //return (halfLen <= x); + + // The commented out code above is what the original engine is doing. Instead of testing the + // upper bound if x is greater than 160 it takes the complement to 315 and test only the lower + // bounds. + // Also note that since it does an integer division to compute the half length of the string, + // in the case where the string has an odd number of characters there is one more character to + // the right than to the left. If the string center is beyond 160, this is taken care of by + // taking the complement to 315 instead of 320. But if the string center is close to the screen + // center, but not greater than 160, this can lead to the string being accepted despite having + // one character beyond the right edge of the screen. + // In ScummVM we therefore also test the right edge, which leads to differences + // with the original engine, but for the better. + if (x > 160) + return (315 - x - halfLen >= 0); + return (x - halfLen >= 0 && x + halfLen + (textLen % 2) * CHAR_WIDTH <= 320); } void DrasculaEngine::centerText(const char *message, int textX, int textY) { char msg[200]; - char messageLine[200]; - char tmpMessageLine[200]; - *messageLine = 0; - *tmpMessageLine = 0; - char *curWord; - int curLine = 0; - int x = 0; - // original starts printing 4 lines above textY - int y = CLIP<int>(textY - (4 * CHAR_HEIGHT), 0, 320); - Common::strlcpy(msg, message, 200); + + // We make sure to have a width of at least 120 pixels by clipping the center. + // In theory since the screen width is 320 I would expect something like this: + // x = CLIP<int>(x, 60, 260); + // return (x - halfLen >= 0 && x + halfLen <= 319); + + // The engines does things differently though. It tries to clips text at 315 instead of 319. + // See also the comment in textFitsCentered(). + + textX = CLIP<int>(textX, 60, 255); // If the message fits on screen as-is, just print it here if (textFitsCentered(msg, textX)) { - x = CLIP<int>(textX - strlen(msg) * CHAR_WIDTH / 2, 60, 255); + int x = textX - (strlen(msg) / 2) * CHAR_WIDTH - 1; + // The original starts to draw (nbLines + 2) lines above textY, except if there is a single line + // in which case it starts drawing at (nbLines + 3) above textY. + // Also clip to the screen height although the original does not do it. + int y = textY - 4 * CHAR_HEIGHT; + y = CLIP<int>(y, 0, 200 - CHAR_HEIGHT); print_abc(msg, x, y); return; } @@ -351,42 +378,61 @@ void DrasculaEngine::centerText(const char *message, int textX, int textY) { // with the German translation. if (!strchr(msg, ' ')) { int len = strlen(msg); - x = CLIP<int>(textX - len * CHAR_WIDTH / 2, 0, 319 - len * CHAR_WIDTH); + int x = CLIP<int>(textX - (len / 2) * CHAR_WIDTH - 1, 0, 319 - len * CHAR_WIDTH); + int y = textY - 4 * CHAR_HEIGHT; + y = CLIP<int>(y, 0, 200 - CHAR_HEIGHT); print_abc(msg, x, y); return; } // Message doesn't fit on screen, split it - + char messageLines[15][41]; // screenWidth/charWidth = 320/8 = 40. Thus lines can have up to 41 characters with the null terminator (despite the original allocating only 40 characters here). + int curLine = 0; + char messageCurLine[50]; + char tmpMessageCurLine[50]; + *messageCurLine = 0; + *tmpMessageCurLine = 0; // Get a word from the message - curWord = strtok(msg, " "); + char* curWord = strtok(msg, " "); while (curWord != NULL) { // Check if the word and the current line fit on screen - if (tmpMessageLine[0] != '\0') - Common::strlcat(tmpMessageLine, " ", 200); - Common::strlcat(tmpMessageLine, curWord, 200); - if (textFitsCentered(tmpMessageLine, textX)) { + if (tmpMessageCurLine[0] != '\0') + Common::strlcat(tmpMessageCurLine, " ", 50); + Common::strlcat(tmpMessageCurLine, curWord, 50); + if (textFitsCentered(tmpMessageCurLine, textX)) { // Line fits, so add the word to the current message line - strcpy(messageLine, tmpMessageLine); + strcpy(messageCurLine, tmpMessageCurLine); } else { - // Line doesn't fit, so show the current line on screen and - // create a new one - // If it goes off screen, print_abc will adjust it - x = CLIP<int>(textX - strlen(messageLine) * CHAR_WIDTH / 2, 60, 255); - print_abc(messageLine, x, y + curLine * CHAR_HEIGHT); - Common::strlcpy(messageLine, curWord, 200); - Common::strlcpy(tmpMessageLine, curWord, 200); - curLine++; + // Line does't fit. Store the current line and start a new line. + Common::strlcpy(messageLines[curLine++], messageCurLine, 41); + Common::strlcpy(messageCurLine, curWord, 50); + Common::strlcpy(tmpMessageCurLine, curWord, 50); } // Get next word curWord = strtok(NULL, " "); - if (curWord == NULL) { - x = CLIP<int>(textX - strlen(messageLine) * CHAR_WIDTH / 2, 60, 255); - print_abc(messageLine, x, y + curLine * CHAR_HEIGHT); + // The original has an interesting bug that if we split the text on several lines + // a space is added at the end (which impacts the alignment, and may even cause the line + // to become too long). + Common::strlcat(messageCurLine, " ", 50); + if (!textFitsCentered(messageCurLine, textX)) { + messageCurLine[strlen(messageCurLine) - 1] = '\0'; + Common::strlcpy(messageLines[curLine++], messageCurLine, 41); + strcpy(messageLines[curLine++], " "); + } else + Common::strlcpy(messageLines[curLine++], messageCurLine, 41); } } + + // The original starts to draw (nbLines + 2) lines above textY. + // Also clip to the screen height although the original does not do it. + int y = textY - (curLine + 2) * CHAR_HEIGHT; + y = CLIP<int>(y, 0, 200 - curLine * (CHAR_HEIGHT + 2) + 2); + for (int line = 0 ; line < curLine ; ++line, y += CHAR_HEIGHT + 2) { + int textHalfLen = (strlen(messageLines[line]) / 2) * CHAR_WIDTH; + print_abc(messageLines[line], textX - textHalfLen - 1, y); + } } void DrasculaEngine::screenSaver() { diff --git a/engines/drascula/objects.cpp b/engines/drascula/objects.cpp index cd7d502194..823c073d43 100644 --- a/engines/drascula/objects.cpp +++ b/engines/drascula/objects.cpp @@ -62,7 +62,7 @@ void DrasculaEngine::gotoObject(int pointX, int pointY) { hideCursor(); if (currentChapter == 5 || currentChapter == 6) { - if (hare_se_ve == 0) { + if (characterVisible == 0) { curX = roomX; curY = roomY; updateRoom(); diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp index 8691bd2cb4..57d4517295 100644 --- a/engines/drascula/rooms.cpp +++ b/engines/drascula/rooms.cpp @@ -980,12 +980,12 @@ bool DrasculaEngine::room_59(int fl) { playSound(12); pause(19); stopSound(); - hare_se_ve = 0; + characterVisible = 0; updateRoom(); copyRect(101, 34, curX - 4, curY - 1, 37, 70, drawSurface3, screenSurface); copyBackground(0, 0, 0, 0, 320, 200, screenSurface, bgSurface); updateScreen(); - hare_se_ve = 1; + characterVisible = 1; clearRoom(); loadPic("tlef0.alg", bgSurface, COMPLETE_PAL); loadPic("tlef1.alg", drawSurface3); @@ -1399,7 +1399,7 @@ void DrasculaEngine::update_58_pre() { } void DrasculaEngine::update_58() { - if (hare_se_ve == 1) + if (characterVisible == 1) copyRect(67, 139, 140, 147, 12, 16, drawSurface3, screenSurface); } @@ -1845,7 +1845,7 @@ void DrasculaEngine::enterRoom(int roomIndex) { } if (currentChapter == 5) - hare_se_ve = 1; + characterVisible = 1; updateVisible(); @@ -1885,7 +1885,7 @@ void DrasculaEngine::enterRoom(int roomIndex) { if (currentChapter == 5) { if (_roomNumber == 45) - hare_se_ve = 0; + characterVisible = 0; if (_roomNumber == 49 && flags[7] == 0) { playTalkSequence(4); // sequence 4, chapter 5 } @@ -1961,7 +1961,7 @@ bool DrasculaEngine::exitRoom(int doorNumber) { } if (currentChapter == 5) - hare_se_ve = 1; + characterVisible = 1; clearRoom(); if (!sscanf(_targetSurface[doorNumber], "%d", &roomNum)) { diff --git a/engines/drascula/saveload.cpp b/engines/drascula/saveload.cpp index d0f16aa941..eb72a999d4 100644 --- a/engines/drascula/saveload.cpp +++ b/engines/drascula/saveload.cpp @@ -255,6 +255,19 @@ bool DrasculaEngine::loadGame(int slot) { if (!(in = _saveFileMan->openForLoading(saveFileName))) { error("missing savegame file %s", saveFileName.c_str()); } + + // If we currently are in room 102 while being attached below the pendulum + // the character is invisible and some surface are temporarily used for other + // things. Reset those before loading the savegame otherwise we may have some + // issues such as the protagonist being invisible after reloading a savegame. + if (_roomNumber == 102 && flags[1] == 2) { + characterVisible = 1; + loadPic(96, frontSurface); + loadPic(97, frontSurface); + loadPic(97, extraSurface); + loadPic(99, backSurface); + } + loadMetaData(in, slot, true); Graphics::skipThumbnail(*in); @@ -287,8 +300,23 @@ bool DrasculaEngine::loadGame(int slot) { if (!sscanf(currentData, "%d.ald", &roomNum)) { error("Bad save format"); } + + // When loading room 102 while being attached below the pendulum Some variables + // are not correctly set and can cause random crashes when calling enterRoom below. + // The crash occurs in moveCharacters() when accessing factor_red[curY + curHeight]. + if (roomNum == 102 && flags[1] == 2) { + curX = 103; + curY = 108; + curWidth = curHeight = 0; + } + enterRoom(roomNum); selectVerb(kVerbNone); + + // When loading room 102 while being attached below the pendulum we + // need to call activatePendulum() to properly initialized the scene. + if (_roomNumber == 102 && flags[1] == 2) + activatePendulum(); return true; } diff --git a/engines/drascula/sound.cpp b/engines/drascula/sound.cpp index c576b37660..204a6f231c 100644 --- a/engines/drascula/sound.cpp +++ b/engines/drascula/sound.cpp @@ -44,7 +44,7 @@ void DrasculaEngine::updateVolume(Audio::Mixer::SoundType soundType, int prevVol } void DrasculaEngine::volumeControls() { - if (_lang == kSpanish) + if (_lang == kSpanish && currentChapter != 6) loadPic(95, tableSurface); copyRect(1, 56, 73, 63, 177, 97, tableSurface, screenSurface); @@ -101,7 +101,7 @@ void DrasculaEngine::volumeControls() { } - if (_lang == kSpanish) + if (_lang == kSpanish && currentChapter != 6) loadPic(974, tableSurface); selectVerb(kVerbNone); diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp index e9fec868f8..cc329b206b 100644 --- a/engines/drascula/talk.cpp +++ b/engines/drascula/talk.cpp @@ -232,7 +232,7 @@ void DrasculaEngine::talk_solo(const char *said, const char *filename) { if (currentChapter == 1) color_abc(color_solo); - else if (currentChapter == 4) + else if (currentChapter == 5) color_abc(kColorRed); talkInit(filename); diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp index 764171bcb0..8e24c44702 100644 --- a/engines/dreamweb/detection.cpp +++ b/engines/dreamweb/detection.cpp @@ -23,6 +23,7 @@ #include "base/plugins.h" #include "common/algorithm.h" +#include "common/savefile.h" #include "common/system.h" #include "common/translation.h" diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index e39f8c0d51..2e5fb424f8 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -24,17 +24,12 @@ #define DREAMWEB_H #include "common/error.h" -#include "common/file.h" #include "common/keyboard.h" #include "common/random.h" #include "common/rect.h" -#include "common/savefile.h" #include "common/scummsys.h" #include "common/system.h" -#include "audio/audiostream.h" -#include "audio/mixer.h" - #include "engines/engine.h" #include "dreamweb/console.h" @@ -45,6 +40,10 @@ #define SCUMMVM_BLOCK_MAGIC_SIZE 0x1234 #define SAVEGAME_VERSION 1 +namespace Common { +class File; +} + namespace DreamWeb { const unsigned int kNumReelRoutines = 57; diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp index ce89dae732..a104ba727d 100644 --- a/engines/dreamweb/saveload.cpp +++ b/engines/dreamweb/saveload.cpp @@ -28,6 +28,7 @@ #include "gui/saveload.h" #include "common/config-manager.h" #include "common/translation.h" +#include "common/savefile.h" #include "common/serializer.h" namespace DreamWeb { diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp index d3b417de90..2a4cd9c75c 100644 --- a/engines/dreamweb/sound.cpp +++ b/engines/dreamweb/sound.cpp @@ -25,6 +25,8 @@ #include "common/debug.h" #include "common/file.h" +#include "audio/audiostream.h" + #include "dreamweb/dreamweb.h" #include "dreamweb/sound.h" diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index 68b223392c..4aa487d13f 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -23,6 +23,7 @@ #include "dreamweb/sound.h" #include "dreamweb/dreamweb.h" #include "common/config-manager.h" +#include "common/file.h" namespace DreamWeb { diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp index c59d3e3ad5..4a7acd2344 100644 --- a/engines/dreamweb/vgagrafx.cpp +++ b/engines/dreamweb/vgagrafx.cpp @@ -21,6 +21,7 @@ */ #include "dreamweb/dreamweb.h" +#include "common/file.h" #include "engines/util.h" #include "graphics/surface.h" #include "image/pcx.h" diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp index ebaff32550..c2aae9ba88 100644 --- a/engines/fullpipe/fullpipe.cpp +++ b/engines/fullpipe/fullpipe.cpp @@ -24,6 +24,7 @@ #include "common/archive.h" #include "common/config-manager.h" +#include "audio/mixer.h" #include "engines/util.h" @@ -112,6 +113,8 @@ FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc) _musicLocal = 0; _trackStartDelay = 0; + _sceneTrackHandle = new Audio::SoundHandle(); + memset(_sceneTracks, 0, sizeof(_sceneTracks)); memset(_trackName, 0, sizeof(_trackName)); memset(_sceneTracksCurrentTrack, 0, sizeof(_sceneTracksCurrentTrack)); @@ -192,6 +195,7 @@ FullpipeEngine::~FullpipeEngine() { delete _rnd; delete _console; delete _globalMessageQueueList; + delete _sceneTrackHandle; } void FullpipeEngine::initialize() { diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h index 7f20a6d6af..fba61aa13b 100644 --- a/engines/fullpipe/fullpipe.h +++ b/engines/fullpipe/fullpipe.h @@ -30,8 +30,6 @@ #include "common/savefile.h" #include "common/system.h" -#include "audio/mixer.h" - #include "graphics/transparent_surface.h" #include "engines/engine.h" @@ -41,6 +39,10 @@ struct ADGameDescription; +namespace Audio { +class SoundHandle; +} + namespace Fullpipe { enum FullpipeGameFeatures { @@ -312,7 +314,7 @@ public: void lift_openLift(); GameVar *_musicGameVar; - Audio::SoundHandle _sceneTrackHandle; + Audio::SoundHandle *_sceneTrackHandle; public: diff --git a/engines/fullpipe/sound.cpp b/engines/fullpipe/sound.cpp index 230d6c39a9..c82c2c414c 100644 --- a/engines/fullpipe/sound.cpp +++ b/engines/fullpipe/sound.cpp @@ -30,6 +30,7 @@ #include "fullpipe/statics.h" #include "common/memstream.h" +#include "audio/mixer.h" #include "audio/audiostream.h" #include "audio/decoders/vorbis.h" #include "audio/decoders/wave.h" @@ -96,12 +97,13 @@ Sound::Sound() { memset(_directSoundBuffers, 0, sizeof(_directSoundBuffers)); _description = 0; _volume = 100; + _handle = new Audio::SoundHandle(); } Sound::~Sound() { freeSound(); - free(_description); + delete _handle; } bool Sound::load(MfcArchive &file, NGIArchive *archive) { @@ -206,14 +208,14 @@ void Sound::setPanAndVolumeByStaticAni() { } void Sound::setPanAndVolume(int vol, int pan) { - g_fp->_mixer->setChannelVolume(_handle, vol / 39); // 0..10000 - g_fp->_mixer->setChannelBalance(_handle, pan / 78); // -10000..10000 + g_fp->_mixer->setChannelVolume(*_handle, vol / 39); // 0..10000 + g_fp->_mixer->setChannelBalance(*_handle, pan / 78); // -10000..10000 } void Sound::play(int flag) { - Audio::SoundHandle handle = getHandle(); + Audio::SoundHandle *handle = getHandle(); - if (g_fp->_mixer->isSoundHandleActive(handle)) + if (g_fp->_mixer->isSoundHandleActive(*handle)) return; byte *soundData = loadData(); @@ -221,7 +223,7 @@ void Sound::play(int flag) { Audio::RewindableAudioStream *wav = Audio::makeWAVStream(dataStream, DisposeAfterUse::YES); Audio::AudioStream *audioStream = new Audio::LoopingAudioStream(wav, (flag == 1) ? 0 : 1); - g_fp->_mixer->playStream(Audio::Mixer::kSFXSoundType, &handle, audioStream); + g_fp->_mixer->playStream(Audio::Mixer::kSFXSoundType, handle, audioStream); } void Sound::freeSound() { @@ -231,11 +233,11 @@ void Sound::freeSound() { } int Sound::getVolume() { - return g_fp->_mixer->getChannelVolume(_handle) * 39; // 0..10000 + return g_fp->_mixer->getChannelVolume(*_handle) * 39; // 0..10000 } void Sound::stop() { - g_fp->_mixer->stopHandle(_handle); + g_fp->_mixer->stopHandle(*_handle); } void FullpipeEngine::setSceneMusicParameters(GameVar *gvar) { @@ -353,7 +355,7 @@ void FullpipeEngine::startSoundStream1(char *trackName) { stopAllSoundStreams(); #ifdef USE_VORBIS - if (_mixer->isSoundHandleActive(_sceneTrackHandle)) + if (_mixer->isSoundHandleActive(*_sceneTrackHandle)) return; Common::File *track = new Common::File(); @@ -363,7 +365,7 @@ void FullpipeEngine::startSoundStream1(char *trackName) { return; } Audio::RewindableAudioStream *ogg = Audio::makeVorbisStream(track, DisposeAfterUse::YES); - _mixer->playStream(Audio::Mixer::kMusicSoundType, &_sceneTrackHandle, ogg); + _mixer->playStream(Audio::Mixer::kMusicSoundType, _sceneTrackHandle, ogg); #endif } diff --git a/engines/fullpipe/sound.h b/engines/fullpipe/sound.h index 14e766f5bb..983f28312b 100644 --- a/engines/fullpipe/sound.h +++ b/engines/fullpipe/sound.h @@ -23,6 +23,10 @@ #ifndef FULLPIPE_SOUND_H #define FULLPIPE_SOUND_H +namespace Audio { +class SoundHandle; +} + namespace Fullpipe { class Sound : public MemoryObject { @@ -31,7 +35,7 @@ class Sound : public MemoryObject { int _directSoundBuffer; int _directSoundBuffers[7]; byte *_soundData; - Audio::SoundHandle _handle; + Audio::SoundHandle *_handle; int _volume; public: @@ -45,7 +49,7 @@ public: virtual bool load(MfcArchive &file) { assert(0); return false; } // Disable base class void updateVolume(); int getId() const { return _id; } - Audio::SoundHandle getHandle() const { return _handle; } + Audio::SoundHandle *getHandle() const { return _handle; } void play(int flag); void freeSound(); diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp index 3aa7ad1664..4b58819c01 100644 --- a/engines/gob/inter_v2.cpp +++ b/engines/gob/inter_v2.cpp @@ -26,9 +26,6 @@ #include "gui/message.h" -#include "audio/mixer.h" -#include "audio/mods/infogrames.h" - #include "gob/gob.h" #include "gob/inter.h" #include "gob/global.h" diff --git a/engines/gob/sound/adlib.h b/engines/gob/sound/adlib.h index d60458295c..9d6b3053b6 100644 --- a/engines/gob/sound/adlib.h +++ b/engines/gob/sound/adlib.h @@ -25,7 +25,6 @@ #include "common/mutex.h" -#include "audio/audiostream.h" #include "audio/mixer.h" namespace OPL { diff --git a/engines/gob/sound/bgatmosphere.h b/engines/gob/sound/bgatmosphere.h index 1cfc63c79a..c838a2c2bb 100644 --- a/engines/gob/sound/bgatmosphere.h +++ b/engines/gob/sound/bgatmosphere.h @@ -23,13 +23,16 @@ #ifndef GOB_SOUND_BGATMOSPHERE_H #define GOB_SOUND_BGATMOSPHERE_H -#include "audio/mixer.h" #include "common/array.h" #include "common/mutex.h" #include "common/random.h" #include "gob/sound/soundmixer.h" +namespace Audio { +class Mixer; +} + namespace Gob { class SoundDesc; diff --git a/engines/gob/sound/pcspeaker.cpp b/engines/gob/sound/pcspeaker.cpp index d0dcb9a871..7ba9fa75df 100644 --- a/engines/gob/sound/pcspeaker.cpp +++ b/engines/gob/sound/pcspeaker.cpp @@ -20,6 +20,7 @@ * */ +#include "audio/softsynth/pcspk.h" #include "gob/sound/pcspeaker.h" namespace Gob { diff --git a/engines/gob/sound/pcspeaker.h b/engines/gob/sound/pcspeaker.h index ba2e00ce3e..2c3a12a168 100644 --- a/engines/gob/sound/pcspeaker.h +++ b/engines/gob/sound/pcspeaker.h @@ -24,7 +24,10 @@ #define GOB_SOUND_PCSPEAKER_H #include "audio/mixer.h" -#include "audio/softsynth/pcspk.h" + +namespace Audio { +class PCSpeaker; +} namespace Gob { diff --git a/engines/gob/sound/protracker.cpp b/engines/gob/sound/protracker.cpp index ce29100b85..7cf8dbb37c 100644 --- a/engines/gob/sound/protracker.cpp +++ b/engines/gob/sound/protracker.cpp @@ -22,6 +22,7 @@ #include "common/file.h" +#include "audio/audiostream.h" #include "audio/mods/protracker.h" #include "gob/sound/protracker.h" diff --git a/engines/gob/sound/protracker.h b/engines/gob/sound/protracker.h index ccd0d51552..17d909346e 100644 --- a/engines/gob/sound/protracker.h +++ b/engines/gob/sound/protracker.h @@ -24,7 +24,10 @@ #define GOB_SOUND_PROTRACKER_H #include "audio/mixer.h" -#include "audio/audiostream.h" + +namespace Audio { +class AudioStream; +} namespace Gob { diff --git a/engines/gob/sound/soundblaster.h b/engines/gob/sound/soundblaster.h index 6a732dbec9..8abed62019 100644 --- a/engines/gob/sound/soundblaster.h +++ b/engines/gob/sound/soundblaster.h @@ -24,10 +24,13 @@ #define GOB_SOUND_SOUNDBLASTER_H #include "common/mutex.h" -#include "audio/mixer.h" #include "gob/sound/soundmixer.h" +namespace Audio { +class Mixer; +} + namespace Gob { class SoundDesc; diff --git a/engines/gob/sound/sounddesc.cpp b/engines/gob/sound/sounddesc.cpp index f981d0b385..d56387078a 100644 --- a/engines/gob/sound/sounddesc.cpp +++ b/engines/gob/sound/sounddesc.cpp @@ -24,7 +24,6 @@ #include "common/memstream.h" #include "common/textconsole.h" -#include "audio/mixer.h" #include "audio/decoders/raw.h" #include "audio/decoders/wave.h" diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp index bbc290eccf..ac77ec3099 100644 --- a/engines/groovie/groovie.cpp +++ b/engines/groovie/groovie.cpp @@ -20,9 +20,6 @@ * */ -#include "audio/mididrv.h" -#include "audio/mixer.h" - #include "groovie/groovie.h" #include "groovie/cursor.h" #include "groovie/detection.h" diff --git a/engines/groovie/music.h b/engines/groovie/music.h index dcb91d42a8..c549527c77 100644 --- a/engines/groovie/music.h +++ b/engines/groovie/music.h @@ -25,6 +25,8 @@ #include "common/array.h" #include "common/mutex.h" +#include "audio/mididrv.h" +#include "audio/mixer.h" class MidiParser; diff --git a/engines/groovie/player.cpp b/engines/groovie/player.cpp index c1b90fbd2c..dea32386f2 100644 --- a/engines/groovie/player.cpp +++ b/engines/groovie/player.cpp @@ -21,6 +21,7 @@ */ #include "common/debug.h" +#include "audio/audiostream.h" #include "groovie/player.h" #include "groovie/groovie.h" diff --git a/engines/groovie/player.h b/engines/groovie/player.h index b1aac963f2..952d3ac208 100644 --- a/engines/groovie/player.h +++ b/engines/groovie/player.h @@ -24,7 +24,10 @@ #define GROOVIE_PLAYER_H #include "common/system.h" -#include "audio/audiostream.h" + +namespace Audio { +class QueuingAudioStream; +} namespace Groovie { diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp index f14cacd6b8..c1b6c44c4d 100644 --- a/engines/groovie/roq.cpp +++ b/engines/groovie/roq.cpp @@ -40,6 +40,7 @@ // Required for the YUV to RGB conversion #include "graphics/conversion.h" #endif +#include "audio/audiostream.h" #include "audio/mixer.h" #include "audio/decoders/raw.h" diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp index eef97b6ff9..47fdaacf7a 100644 --- a/engines/groovie/script.cpp +++ b/engines/groovie/script.cpp @@ -21,7 +21,6 @@ */ #include "audio/mididrv.h" -#include "audio/mixer.h" #include "groovie/script.h" #include "groovie/cell.h" diff --git a/engines/groovie/vdx.cpp b/engines/groovie/vdx.cpp index 09c2e0d3ea..94b6aa0680 100644 --- a/engines/groovie/vdx.cpp +++ b/engines/groovie/vdx.cpp @@ -28,6 +28,7 @@ #include "common/debug.h" #include "common/debug-channels.h" #include "common/textconsole.h" +#include "audio/audiostream.h" #include "audio/mixer.h" #include "audio/decoders/raw.h" #include "graphics/palette.h" diff --git a/engines/hopkins/hopkins.h b/engines/hopkins/hopkins.h index b782d103a8..30140baa2e 100644 --- a/engines/hopkins/hopkins.h +++ b/engines/hopkins/hopkins.h @@ -48,7 +48,6 @@ #include "common/util.h" #include "engines/engine.h" #include "graphics/surface.h" -#include "gui/debugger.h" /** * This is the namespace of the Hopkins engine. diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp index 6660233740..3030636a59 100644 --- a/engines/hopkins/sound.cpp +++ b/engines/hopkins/sound.cpp @@ -26,6 +26,8 @@ #include "hopkins/hopkins.h" #include "audio/decoders/adpcm_intern.h" +#include "audio/decoders/wave.h" +#include "audio/softsynth/pcspk.h" #include "common/system.h" #include "common/config-manager.h" #include "common/file.h" diff --git a/engines/hopkins/sound.h b/engines/hopkins/sound.h index 1fb4f9ae71..49c5846198 100644 --- a/engines/hopkins/sound.h +++ b/engines/hopkins/sound.h @@ -25,10 +25,16 @@ #include "common/scummsys.h" #include "common/str.h" -#include "audio/audiostream.h" -#include "audio/decoders/wave.h" #include "audio/mixer.h" +namespace Audio { +class RewindableAudioStream; +} + +namespace Common { +class SeekableReadStream; +} + namespace Hopkins { class VoiceItem { diff --git a/engines/hugo/dialogs.cpp b/engines/hugo/dialogs.cpp index 8b145b78d8..c741c6a837 100644 --- a/engines/hugo/dialogs.cpp +++ b/engines/hugo/dialogs.cpp @@ -26,7 +26,8 @@ #include "image/bmp.h" #include "hugo/hugo.h" -#include "hugo/display.h" +#include "hugo/dialogs.h" +#include "hugo/file.h" #include "hugo/parser.h" #include "hugo/schedule.h" #include "hugo/sound.h" diff --git a/engines/hugo/dialogs.h b/engines/hugo/dialogs.h index 55bb8f9fd0..aebbeee8c1 100644 --- a/engines/hugo/dialogs.h +++ b/engines/hugo/dialogs.h @@ -28,6 +28,8 @@ namespace Hugo { +class HugoEngine; + enum MenuOption { kMenuWhat = 0, kMenuMusic, diff --git a/engines/hugo/display.cpp b/engines/hugo/display.cpp index a8a22fb4b9..17627608bd 100644 --- a/engines/hugo/display.cpp +++ b/engines/hugo/display.cpp @@ -37,6 +37,7 @@ #include "hugo/hugo.h" #include "hugo/display.h" +#include "hugo/file.h" #include "hugo/inventory.h" #include "hugo/util.h" #include "hugo/object.h" diff --git a/engines/hugo/display.h b/engines/hugo/display.h index e152a7f868..99fda0a638 100644 --- a/engines/hugo/display.h +++ b/engines/hugo/display.h @@ -30,6 +30,11 @@ #ifndef HUGO_DISPLAY_H #define HUGO_DISPLAY_H +namespace Common { +class ReadStream; +class WriteStream; +} + namespace Hugo { enum OverlayState {kOvlUndef, kOvlForeground, kOvlBackground}; // Overlay state diff --git a/engines/hugo/file.h b/engines/hugo/file.h index d43528f0f8..731eb70a35 100644 --- a/engines/hugo/file.h +++ b/engines/hugo/file.h @@ -30,6 +30,8 @@ #ifndef HUGO_FILE_H #define HUGO_FILE_H +#include "common/file.h" + namespace Hugo { /** * Enumerate overlay file types diff --git a/engines/hugo/hugo.cpp b/engines/hugo/hugo.cpp index 8f89832f6b..267eb08436 100644 --- a/engines/hugo/hugo.cpp +++ b/engines/hugo/hugo.cpp @@ -29,7 +29,10 @@ #include "common/textconsole.h" #include "hugo/hugo.h" +#include "hugo/console.h" +#include "hugo/dialogs.h" #include "hugo/file.h" +#include "hugo/game.h" #include "hugo/schedule.h" #include "hugo/display.h" #include "hugo/mouse.h" diff --git a/engines/hugo/hugo.h b/engines/hugo/hugo.h index cc0fcc6ec2..27dfea8725 100644 --- a/engines/hugo/hugo.h +++ b/engines/hugo/hugo.h @@ -24,19 +24,16 @@ #define HUGO_H #include "engines/engine.h" -#include "common/file.h" -#include "hugo/console.h" -#include "hugo/dialogs.h" // This include is here temporarily while the engine is being refactored. #include "hugo/game.h" -#include "hugo/file.h" #define HUGO_DAT_VER_MAJ 0 // 1 byte #define HUGO_DAT_VER_MIN 42 // 1 byte #define DATAALIGNMENT 4 namespace Common { +class SeekableReadStream; class RandomSource; } @@ -209,6 +206,8 @@ class SoundHandler; class IntroHandler; class ObjectHandler; class TextHandler; +class TopMenu; +class HugoConsole; class HugoEngine : public Engine { public: diff --git a/engines/hugo/intro.cpp b/engines/hugo/intro.cpp index 26ef65edf8..e15291e03b 100644 --- a/engines/hugo/intro.cpp +++ b/engines/hugo/intro.cpp @@ -29,9 +29,13 @@ #include "common/system.h" #include "common/textconsole.h" +#include "graphics/font.h" +#include "graphics/pixelformat.h" #include "hugo/hugo.h" #include "hugo/intro.h" +#include "hugo/file.h" +#include "hugo/game.h" #include "hugo/util.h" #include "hugo/display.h" #include "hugo/sound.h" diff --git a/engines/hugo/intro.h b/engines/hugo/intro.h index 7af53c8922..d40cffbfaf 100644 --- a/engines/hugo/intro.h +++ b/engines/hugo/intro.h @@ -29,6 +29,7 @@ #ifndef INTRO_H #define INTRO_H +#include "graphics/surface.h" #include "graphics/fonts/winfont.h" namespace Hugo { diff --git a/engines/hugo/mouse.cpp b/engines/hugo/mouse.cpp index 3674c90757..8c0ba12f8f 100644 --- a/engines/hugo/mouse.cpp +++ b/engines/hugo/mouse.cpp @@ -33,6 +33,7 @@ #include "common/system.h" #include "hugo/hugo.h" +#include "hugo/dialogs.h" #include "hugo/game.h" #include "hugo/mouse.h" #include "hugo/schedule.h" diff --git a/engines/hugo/mouse.h b/engines/hugo/mouse.h index f9d547ec86..0bfa1b0db4 100644 --- a/engines/hugo/mouse.h +++ b/engines/hugo/mouse.h @@ -29,6 +29,13 @@ #ifndef HUGO_MOUSE_H #define HUGO_MOUSE_H + +#include "hugo/game.h" + +namespace Common { +class ReadStream; +} + namespace Hugo { class MouseHandler { diff --git a/engines/hugo/parser.cpp b/engines/hugo/parser.cpp index 998dd5df58..7ee0198882 100644 --- a/engines/hugo/parser.cpp +++ b/engines/hugo/parser.cpp @@ -29,12 +29,12 @@ #include "common/events.h" #include "common/textconsole.h" +#include "gui/debugger.h" #include "hugo/hugo.h" #include "hugo/display.h" #include "hugo/parser.h" #include "hugo/file.h" -#include "hugo/schedule.h" #include "hugo/util.h" #include "hugo/route.h" #include "hugo/sound.h" diff --git a/engines/hugo/parser.h b/engines/hugo/parser.h index 5a2ac7d375..dfdd984832 100644 --- a/engines/hugo/parser.h +++ b/engines/hugo/parser.h @@ -32,6 +32,7 @@ namespace Common { struct Event; +class ReadStream; } namespace Hugo { diff --git a/engines/hugo/sound.cpp b/engines/hugo/sound.cpp index 8591709dc3..09de256789 100644 --- a/engines/hugo/sound.cpp +++ b/engines/hugo/sound.cpp @@ -37,6 +37,7 @@ #include "audio/decoders/raw.h" #include "audio/audiostream.h" #include "audio/midiparser.h" +#include "audio/softsynth/pcspk.h" #include "hugo/hugo.h" #include "hugo/game.h" diff --git a/engines/hugo/sound.h b/engines/hugo/sound.h index 6c3420918d..a623569a8b 100644 --- a/engines/hugo/sound.h +++ b/engines/hugo/sound.h @@ -32,7 +32,10 @@ #include "audio/mixer.h" #include "audio/midiplayer.h" -#include "audio/softsynth/pcspk.h" + +namespace Audio { +class PCSpeaker; +} namespace Hugo { diff --git a/engines/hugo/text.cpp b/engines/hugo/text.cpp index 50b2b64260..617fccc36d 100644 --- a/engines/hugo/text.cpp +++ b/engines/hugo/text.cpp @@ -20,6 +20,7 @@ * */ #include "common/system.h" +#include "common/stream.h" #include "hugo/hugo.h" #include "hugo/text.h" diff --git a/engines/hugo/util.cpp b/engines/hugo/util.cpp index 7b75bf2bc5..bc1525382c 100644 --- a/engines/hugo/util.cpp +++ b/engines/hugo/util.cpp @@ -28,13 +28,11 @@ */ #include "common/system.h" +#include "common/util.h" #include "gui/message.h" -#include "hugo/game.h" -#include "hugo/hugo.h" +#include "hugo/dialogs.h" #include "hugo/util.h" -#include "hugo/sound.h" -#include "hugo/text.h" namespace Hugo { diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp index 6683f973ca..614d23f70e 100644 --- a/engines/kyra/debugger.cpp +++ b/engines/kyra/debugger.cpp @@ -31,8 +31,6 @@ #include "common/system.h" #include "common/config-manager.h" -#include "gui/message.h" - namespace Kyra { Debugger::Debugger(KyraEngine_v1 *vm) diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp index 38a5ab8440..2264d99dde 100644 --- a/engines/kyra/eobcommon.cpp +++ b/engines/kyra/eobcommon.cpp @@ -24,7 +24,8 @@ #include "kyra/kyra_rpg.h" #include "kyra/resource.h" -#include "kyra/sound_intern.h" +#include "engines/kyra/sound.h" +#include "engines/kyra/sound_adlib.h" #include "kyra/script_eob.h" #include "kyra/timer.h" #include "kyra/debugger.h" @@ -32,9 +33,6 @@ #include "common/config-manager.h" #include "common/translation.h" -#include "audio/mididrv.h" -#include "audio/mixer.h" - #include "backends/keymapper/keymapper.h" namespace Kyra { diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp index 80511c674d..118ca8dfaa 100644 --- a/engines/kyra/kyra_lok.cpp +++ b/engines/kyra/kyra_lok.cpp @@ -33,8 +33,6 @@ #include "common/config-manager.h" #include "common/debug-channels.h" -#include "gui/message.h" - namespace Kyra { KyraEngine_LoK::KyraEngine_LoK(OSystem *system, const GameFlags &flags) diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index 925dcf7bfe..106420d9c2 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -46,6 +46,8 @@ KyraEngine_v2::KyraEngine_v2(OSystem *system, const GameFlags &flags, const Engi memset(&_sceneScriptState, 0, sizeof(_sceneScriptState)); memset(&_sceneScriptData, 0, sizeof(_sceneScriptData)); + Common::fill(_sceneSpecialScriptsTimer, ARRAYEND(_sceneSpecialScriptsTimer), 0); + _animObjects = 0; _runFlag = true; diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp index 1d741d8bd0..1703fb904e 100644 --- a/engines/kyra/sound_adlib.cpp +++ b/engines/kyra/sound_adlib.cpp @@ -44,15 +44,17 @@ #include "common/mutex.h" #include "common/config-manager.h" -#include "audio/mixer.h" #include "audio/fmopl.h" -#include "audio/audiostream.h" // Basic AdLib Programming: // http://www.gamedev.net/reference/articles/article446.asp #define CALLBACKS_PER_SECOND 72 +namespace Audio { +class Mixer; +} + namespace Kyra { class AdLibDriver { diff --git a/engines/lab/anim.cpp b/engines/lab/anim.cpp index f2e6992375..1190f0323b 100644 --- a/engines/lab/anim.cpp +++ b/engines/lab/anim.cpp @@ -28,6 +28,8 @@ * */ +#include "common/file.h" + #include "lab/lab.h" #include "lab/anim.h" diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp index af235f234b..d642f2fed5 100644 --- a/engines/lab/dispman.cpp +++ b/engines/lab/dispman.cpp @@ -28,6 +28,7 @@ * */ +#include "common/file.h" #include "graphics/palette.h" #include "lab/lab.h" diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp index 6ba405380e..4f0a0da777 100644 --- a/engines/lab/engine.cpp +++ b/engines/lab/engine.cpp @@ -29,6 +29,7 @@ */ #include "common/config-manager.h" +#include "common/file.h" #include "gui/message.h" diff --git a/engines/lab/intro.cpp b/engines/lab/intro.cpp index 01e8cac401..0184ff7c69 100644 --- a/engines/lab/intro.cpp +++ b/engines/lab/intro.cpp @@ -28,6 +28,8 @@ * */ +#include "common/file.h" + #include "lab/lab.h" #include "lab/anim.h" diff --git a/engines/lab/lab.cpp b/engines/lab/lab.cpp index 9b0ebfc4e5..39b2feb93d 100644 --- a/engines/lab/lab.cpp +++ b/engines/lab/lab.cpp @@ -31,6 +31,7 @@ #include "common/config-manager.h" #include "common/debug-channels.h" #include "common/error.h" +#include "common/file.h" #include "engines/util.h" diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp index 5c6bb07814..057cac3589 100644 --- a/engines/lab/map.cpp +++ b/engines/lab/map.cpp @@ -28,6 +28,8 @@ * */ +#include "common/file.h" + #include "lab/lab.h" #include "lab/dispman.h" diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp index b58d6dc923..579f450456 100644 --- a/engines/lab/music.cpp +++ b/engines/lab/music.cpp @@ -28,6 +28,8 @@ * */ +#include "common/file.h" +#include "audio/audiostream.h" #include "audio/decoders/raw.h" #include "lab/lab.h" diff --git a/engines/lab/music.h b/engines/lab/music.h index 472fe4fef7..8175e350f1 100644 --- a/engines/lab/music.h +++ b/engines/lab/music.h @@ -31,9 +31,11 @@ #ifndef LAB_MUSIC_H #define LAB_MUSIC_H -#include "common/file.h" #include "audio/mixer.h" -#include "audio/audiostream.h" + +namespace Common { +class File; +} namespace Lab { diff --git a/engines/lab/resource.cpp b/engines/lab/resource.cpp index aae369fbae..9cb35d1088 100644 --- a/engines/lab/resource.cpp +++ b/engines/lab/resource.cpp @@ -28,6 +28,8 @@ * */ +#include "common/file.h" + #include "lab/lab.h" #include "lab/dispman.h" diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp index 9f9b993afa..7c3cb39931 100644 --- a/engines/lab/special.cpp +++ b/engines/lab/special.cpp @@ -28,6 +28,8 @@ * */ +#include "common/file.h" + #include "lab/lab.h" #include "lab/anim.h" diff --git a/engines/lure/lure.h b/engines/lure/lure.h index b6eb9123ad..af00197c3f 100644 --- a/engines/lure/lure.h +++ b/engines/lure/lure.h @@ -25,7 +25,6 @@ #include "engines/engine.h" #include "common/rect.h" -#include "audio/mixer.h" #include "common/file.h" #include "common/savefile.h" #include "common/util.h" diff --git a/engines/mads/menu_views.h b/engines/mads/menu_views.h index c203248ad9..e22b6223a7 100644 --- a/engines/mads/menu_views.h +++ b/engines/mads/menu_views.h @@ -8,20 +8,12 @@ * 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. -<<<<<<< HEAD - -======= * ->>>>>>> master * 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. -<<<<<<< HEAD - -======= * ->>>>>>> master * 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. diff --git a/engines/mads/nebular/sound_nebular.cpp b/engines/mads/nebular/sound_nebular.cpp index 4c360b23d5..5f71c99a94 100644 --- a/engines/mads/nebular/sound_nebular.cpp +++ b/engines/mads/nebular/sound_nebular.cpp @@ -20,16 +20,15 @@ * */ -#include "audio/audiostream.h" #include "audio/fmopl.h" -#include "audio/decoders/raw.h" #include "common/algorithm.h" -#include "common/debug.h" #include "common/md5.h" -#include "common/memstream.h" -#include "mads/sound.h" #include "mads/nebular/sound_nebular.h" +namespace Audio { +class Mixer; +} + namespace MADS { namespace Nebular { diff --git a/engines/mads/nebular/sound_nebular.h b/engines/mads/nebular/sound_nebular.h index 2b80b08d89..a9e1493109 100644 --- a/engines/mads/nebular/sound_nebular.h +++ b/engines/mads/nebular/sound_nebular.h @@ -27,8 +27,14 @@ #include "common/file.h" #include "common/mutex.h" #include "common/queue.h" -#include "audio/audiostream.h" -#include "audio/mixer.h" + +namespace Audio { +class Mixer; +} + +namespace Common { +class SeekableReadStream; +} namespace OPL { class OPL; @@ -36,8 +42,6 @@ class OPL; namespace MADS { -class SoundManager; - namespace Nebular { class ASound; diff --git a/engines/mads/sound.cpp b/engines/mads/sound.cpp index c96fd01882..5f2c9aca56 100644 --- a/engines/mads/sound.cpp +++ b/engines/mads/sound.cpp @@ -20,14 +20,16 @@ * */ -#include "audio/audiostream.h" #include "audio/fmopl.h" -#include "audio/decoders/raw.h" #include "common/memstream.h" #include "mads/sound.h" #include "mads/mads.h" #include "mads/nebular/sound_nebular.h" +namespace Audio { +class Mixer; +} + namespace MADS { SoundManager::SoundManager(MADSEngine *vm, Audio::Mixer *mixer) { diff --git a/engines/mads/sound.h b/engines/mads/sound.h index 2c4de6f21d..9674d4198d 100644 --- a/engines/mads/sound.h +++ b/engines/mads/sound.h @@ -25,12 +25,21 @@ #include "common/scummsys.h" #include "common/queue.h" -#include "audio/audiostream.h" -#include "audio/mixer.h" -#include "mads/nebular/sound_nebular.h" + +namespace Audio { +class Mixer; +} + +namespace OPL { +class OPL; +} namespace MADS { +namespace Nebular { +class ASound; +} + class MADSEngine; class SoundManager { diff --git a/engines/mohawk/dialogs.h b/engines/mohawk/dialogs.h index bc25c72a43..59b3e01fb7 100644 --- a/engines/mohawk/dialogs.h +++ b/engines/mohawk/dialogs.h @@ -29,11 +29,13 @@ #include "common/str.h" #include "gui/dialog.h" #include "gui/options.h" -#include "gui/widget.h" -#include "gui/widgets/list.h" namespace GUI { class SaveLoadChooser; +class ButtonWidget; +class CheckboxWidget; +class CommandSender; +class StaticTextWidget; } namespace Mohawk { diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index e2bc88ebf6..633b67f7e9 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -604,7 +604,8 @@ void MohawkEngine_Myst::changeToCard(uint16 card, TransitionType transition) { _gfx->runTransition(transition, Common::Rect(544, 333), 10, 0); } else { _gfx->copyBackBufferToScreen(Common::Rect(544, 333)); - _needsUpdate = true; + _system->updateScreen(); + _needsUpdate = false; } } diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp index 6ad7dd088b..596180ddb2 100644 --- a/engines/mohawk/myst_scripts.cpp +++ b/engines/mohawk/myst_scripts.cpp @@ -31,7 +31,6 @@ #include "common/system.h" #include "common/memstream.h" #include "common/textconsole.h" -#include "gui/message.h" namespace Mohawk { diff --git a/engines/mohawk/myst_stacks/credits.cpp b/engines/mohawk/myst_stacks/credits.cpp index b4a2076528..c382263f7c 100644 --- a/engines/mohawk/myst_stacks/credits.cpp +++ b/engines/mohawk/myst_stacks/credits.cpp @@ -28,7 +28,6 @@ #include "mohawk/myst_stacks/credits.h" #include "common/system.h" -#include "gui/message.h" namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/myst_stacks/intro.cpp b/engines/mohawk/myst_stacks/intro.cpp index 1d733d8100..f448108199 100644 --- a/engines/mohawk/myst_stacks/intro.cpp +++ b/engines/mohawk/myst_stacks/intro.cpp @@ -28,8 +28,6 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/intro.h" -#include "gui/message.h" - namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/myst_stacks/makingof.cpp b/engines/mohawk/myst_stacks/makingof.cpp index 1059fd0c5e..a0a1f359ba 100644 --- a/engines/mohawk/myst_stacks/makingof.cpp +++ b/engines/mohawk/myst_stacks/makingof.cpp @@ -27,8 +27,6 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/makingof.h" -#include "gui/message.h" - namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp index 4dc392a7e9..bd50c4feb3 100644 --- a/engines/mohawk/myst_stacks/myst.cpp +++ b/engines/mohawk/myst_stacks/myst.cpp @@ -33,8 +33,6 @@ #include "common/system.h" #include "common/textconsole.h" -#include "gui/message.h" - namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/myst_stacks/selenitic.cpp b/engines/mohawk/myst_stacks/selenitic.cpp index 5402e5a581..454435cf92 100644 --- a/engines/mohawk/myst_stacks/selenitic.cpp +++ b/engines/mohawk/myst_stacks/selenitic.cpp @@ -31,7 +31,6 @@ #include "common/system.h" #include "common/textconsole.h" -#include "gui/message.h" namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/myst_stacks/slides.cpp b/engines/mohawk/myst_stacks/slides.cpp index a1413f0d71..0560608b24 100644 --- a/engines/mohawk/myst_stacks/slides.cpp +++ b/engines/mohawk/myst_stacks/slides.cpp @@ -29,7 +29,6 @@ #include "mohawk/myst_stacks/slides.h" #include "common/system.h" -#include "gui/message.h" namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp index 898f68c581..178139ab76 100644 --- a/engines/mohawk/riven.cpp +++ b/engines/mohawk/riven.cpp @@ -25,6 +25,7 @@ #include "common/keyboard.h" #include "common/translation.h" #include "common/system.h" +#include "gui/saveload.h" #include "mohawk/cursors.h" #include "mohawk/installer_archive.h" diff --git a/engines/mohawk/riven.h b/engines/mohawk/riven.h index 9c23d07c52..3ea50bb38d 100644 --- a/engines/mohawk/riven.h +++ b/engines/mohawk/riven.h @@ -27,8 +27,6 @@ #include "mohawk/mohawk.h" #include "mohawk/riven_scripts.h" -#include "gui/saveload.h" - #include "common/hashmap.h" #include "common/hash-str.h" #include "common/random.h" diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp index a2c08d4a92..38cb0b3608 100644 --- a/engines/mohawk/sound.cpp +++ b/engines/mohawk/sound.cpp @@ -23,12 +23,12 @@ #include "common/debug.h" #include "common/events.h" #include "common/system.h" -#include "common/util.h" #include "common/textconsole.h" +#include "audio/mididrv.h" #include "audio/midiparser.h" -#include "audio/musicplugin.h" #include "audio/audiostream.h" +#include "audio/decoders/adpcm.h" #include "audio/decoders/mp3.h" #include "audio/decoders/raw.h" #include "audio/decoders/wave.h" diff --git a/engines/mohawk/sound.h b/engines/mohawk/sound.h index c62e6e9874..f09706e155 100644 --- a/engines/mohawk/sound.h +++ b/engines/mohawk/sound.h @@ -26,9 +26,7 @@ #include "common/scummsys.h" #include "common/str.h" -#include "audio/audiostream.h" #include "audio/mixer.h" -#include "audio/decoders/adpcm.h" #include "mohawk/mohawk.h" #include "mohawk/resource.h" @@ -36,6 +34,10 @@ class MidiDriver; class MidiParser; +namespace Audio { +class RewindableAudioStream; +} + namespace Mohawk { #define MAX_CHANNELS 2 // Can there be more than 2? diff --git a/engines/mortevielle/sound.cpp b/engines/mortevielle/sound.cpp index f02ccb69ea..77eba4cd6d 100644 --- a/engines/mortevielle/sound.cpp +++ b/engines/mortevielle/sound.cpp @@ -28,6 +28,7 @@ #include "mortevielle/mortevielle.h" #include "mortevielle/sound.h" +#include "audio/audiostream.h" #include "audio/decoders/raw.h" #include "common/scummsys.h" diff --git a/engines/mortevielle/sound.h b/engines/mortevielle/sound.h index d913684935..15b4667afa 100644 --- a/engines/mortevielle/sound.h +++ b/engines/mortevielle/sound.h @@ -28,11 +28,14 @@ #ifndef MORTEVIELLE_SOUND_H #define MORTEVIELLE_SOUND_H -#include "audio/audiostream.h" #include "audio/mixer.h" #include "common/mutex.h" #include "common/queue.h" +namespace Audio { +class QueuingAudioStream; +} + namespace Mortevielle { class MortevielleEngine; diff --git a/engines/neverhood/menumodule.cpp b/engines/neverhood/menumodule.cpp index 826f175d47..0f2a421d83 100644 --- a/engines/neverhood/menumodule.cpp +++ b/engines/neverhood/menumodule.cpp @@ -609,7 +609,8 @@ void TextEditWidget::onClick() { ++newCursorPos; _cursorPos = MIN((int)_entryString.size(), newCursorPos); } - _cursorSurface->setVisible(true); + if (!_readOnly) + _cursorSurface->setVisible(true); refresh(); } Widget::onClick(); @@ -1058,7 +1059,7 @@ static const NRect kSaveGameMenuTextEditRect = { 0, 0, 377, 17 }; static const NRect kSaveGameMenuMouseRect = { 50, 47, 427, 64 }; SaveGameMenu::SaveGameMenu(NeverhoodEngine *vm, Module *parentModule, SavegameList *savegameList) - : GameStateMenu(vm, parentModule, savegameList, kSaveGameMenuButtonFileHashes, kSaveGameMenuButtonCollisionBounds, + : GameStateMenu(vm, parentModule, savegameList, kSaveGameMenuButtonFileHashes, kSaveGameMenuButtonCollisionBounds, 0x30084E25, 0x2328121A, 0x84E21308, &kSaveGameMenuMouseRect, 0x1115A223, 60, 142, kSaveGameMenuListBoxRect, @@ -1068,9 +1069,11 @@ SaveGameMenu::SaveGameMenu(NeverhoodEngine *vm, Module *parentModule, SavegameLi } void SaveGameMenu::performAction() { - ((MenuModule*)_parentModule)->setSavegameInfo(_textEditWidget->getString(), - _listBox->getCurrIndex(), _textEditWidget->isModified()); - leaveScene(0); + if (!_textEditWidget->getString().empty()) { + ((MenuModule*)_parentModule)->setSavegameInfo(_textEditWidget->getString(), + _listBox->getCurrIndex(), _textEditWidget->isModified()); + leaveScene(0); + } } static const uint32 kLoadGameMenuButtonFileHashes[] = { @@ -1089,12 +1092,21 @@ static const NRect kLoadGameMenuButtonCollisionBounds[] = { static const NRect kLoadGameMenuListBoxRect = { 0, 0, 320, 272 }; static const NRect kLoadGameMenuTextEditRect = { 0, 0, 320, 17 }; + +#if 0 +// Unlike the original game, the text widget in our load dialog is read-only so +// don't change the mouse cursor to indicate that you can type the name of the +// game to load. +// +// Since we allow multiple saved games to have the same name, it's probably +// better this way. static const NRect kLoadGameMenuMouseRect = { 263, 48, 583, 65 }; +#endif LoadGameMenu::LoadGameMenu(NeverhoodEngine *vm, Module *parentModule, SavegameList *savegameList) : GameStateMenu(vm, parentModule, savegameList, kLoadGameMenuButtonFileHashes, kLoadGameMenuButtonCollisionBounds, 0x98620234, 0x201C2474, - 0x2023098E, &kLoadGameMenuMouseRect, + 0x2023098E, NULL /* &kLoadGameMenuMouseRect */, 0x04040409, 263, 142, kLoadGameMenuListBoxRect, 0x10924C03, 0, 263, 48, kLoadGameMenuTextEditRect, 0x0BC600A3, 0x0F960021) { @@ -1102,8 +1114,11 @@ LoadGameMenu::LoadGameMenu(NeverhoodEngine *vm, Module *parentModule, SavegameLi } void LoadGameMenu::performAction() { - ((MenuModule*)_parentModule)->setLoadgameInfo(_listBox->getCurrIndex()); - leaveScene(0); + // TODO: The original would display a message here if nothing was selected. + if (!_textEditWidget->getString().empty()) { + ((MenuModule*)_parentModule)->setLoadgameInfo(_listBox->getCurrIndex()); + leaveScene(0); + } } static const uint32 kDeleteGameMenuButtonFileHashes[] = { @@ -1134,8 +1149,11 @@ DeleteGameMenu::DeleteGameMenu(NeverhoodEngine *vm, Module *parentModule, Savega } void DeleteGameMenu::performAction() { - ((MenuModule*)_parentModule)->setDeletegameInfo(_listBox->getCurrIndex()); - leaveScene(0); + // TODO: The original would display a message here if no game was selected. + if (!_textEditWidget->getString().empty()) { + ((MenuModule*)_parentModule)->setDeletegameInfo(_listBox->getCurrIndex()); + leaveScene(0); + } } QueryOverwriteMenu::QueryOverwriteMenu(NeverhoodEngine *vm, Module *parentModule, const Common::String &description) diff --git a/engines/neverhood/neverhood.h b/engines/neverhood/neverhood.h index 0661bcba0e..9eac4ffc44 100644 --- a/engines/neverhood/neverhood.h +++ b/engines/neverhood/neverhood.h @@ -30,7 +30,6 @@ #include "common/savefile.h" #include "common/str-array.h" #include "common/system.h" -#include "audio/mixer.h" #include "engines/engine.h" #include "gui/debugger.h" #include "neverhood/console.h" diff --git a/engines/neverhood/sound.h b/engines/neverhood/sound.h index 512b0fef98..24947f0191 100644 --- a/engines/neverhood/sound.h +++ b/engines/neverhood/sound.h @@ -24,6 +24,7 @@ #define NEVERHOOD_SOUND_H #include "audio/audiostream.h" +#include "audio/mixer.h" #include "common/array.h" #include "graphics/surface.h" #include "neverhood/neverhood.h" diff --git a/engines/parallaction/saveload.cpp b/engines/parallaction/saveload.cpp index 6d598d9557..eff088d5ee 100644 --- a/engines/parallaction/saveload.cpp +++ b/engines/parallaction/saveload.cpp @@ -25,10 +25,7 @@ #include "common/textconsole.h" #include "common/translation.h" -#include "gui/dialog.h" #include "gui/saveload.h" -#include "gui/widget.h" -#include "gui/widgets/list.h" #include "gui/message.h" #include "parallaction/parallaction.h" diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp index 55f12a6560..b39d26e056 100644 --- a/engines/prince/prince.cpp +++ b/engines/prince/prince.cpp @@ -41,6 +41,7 @@ #include "engines/advancedDetector.h" #include "audio/audiostream.h" +#include "audio/decoders/wave.h" #include "prince/prince.h" #include "prince/font.h" diff --git a/engines/prince/sound.cpp b/engines/prince/sound.cpp index 032297ee43..c9746842ef 100644 --- a/engines/prince/sound.cpp +++ b/engines/prince/sound.cpp @@ -20,15 +20,13 @@ * */ -#include "prince/prince.h" #include "prince/sound.h" #include "prince/musNum.h" -#include "common/config-manager.h" -#include "common/memstream.h" #include "common/archive.h" -#include "audio/decoders/raw.h" -#include "audio/audiostream.h" +#include "common/debug.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" namespace Prince { diff --git a/engines/prince/sound.h b/engines/prince/sound.h index cc44b0a110..4257a4a37b 100644 --- a/engines/prince/sound.h +++ b/engines/prince/sound.h @@ -23,13 +23,7 @@ #ifndef PRINCE_SOUND_H #define PRINCE_SOUND_H -#include "audio/audiostream.h" -#include "audio/decoders/wave.h" -#include "audio/fmopl.h" -#include "audio/mididrv.h" -#include "audio/midiparser.h" #include "audio/midiplayer.h" -#include "audio/mixer.h" #include "common/memstream.h" namespace Prince { diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp index 63e24454c1..d715d3737e 100644 --- a/engines/queen/sound.cpp +++ b/engines/queen/sound.cpp @@ -35,10 +35,10 @@ #include "audio/audiostream.h" #include "audio/decoders/flac.h" -#include "audio/mididrv.h" #include "audio/decoders/mp3.h" #include "audio/decoders/raw.h" #include "audio/decoders/vorbis.h" +#include "audio/mods/rjp1.h" #define SB_HEADER_SIZE_V104 110 #define SB_HEADER_SIZE_V110 122 diff --git a/engines/queen/sound.h b/engines/queen/sound.h index d06d93b9e1..f5d3970b80 100644 --- a/engines/queen/sound.h +++ b/engines/queen/sound.h @@ -23,10 +23,11 @@ #ifndef QUEEN_SOUND_H #define QUEEN_SOUND_H -#include "common/util.h" #include "audio/mixer.h" -#include "audio/mods/rjp1.h" -#include "queen/defs.h" + +namespace Audio { +class AudioStream; +} namespace Common { class File; diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp index cd48ebaa4d..0bc1e8a2a0 100644 --- a/engines/saga/music.cpp +++ b/engines/saga/music.cpp @@ -32,7 +32,10 @@ #include "audio/midiparser.h" #include "audio/midiparser_qt.h" #include "audio/miles.h" +#include "audio/decoders/flac.h" +#include "audio/decoders/mp3.h" #include "audio/decoders/raw.h" +#include "audio/decoders/vorbis.h" #include "common/config-manager.h" #include "common/file.h" #include "common/substream.h" diff --git a/engines/saga/music.h b/engines/saga/music.h index 2e7cc4c5ec..0213f4108a 100644 --- a/engines/saga/music.h +++ b/engines/saga/music.h @@ -25,13 +25,10 @@ #ifndef SAGA_MUSIC_H #define SAGA_MUSIC_H +#include "audio/mididrv.h" #include "audio/midiplayer.h" #include "audio/midiparser.h" #include "audio/mixer.h" -#include "audio/decoders/mp3.h" -#include "audio/decoders/vorbis.h" -#include "audio/decoders/flac.h" -#include "common/mutex.h" namespace Saga { diff --git a/engines/saga/shorten.cpp b/engines/saga/shorten.cpp index 1e1c397212..db67d510bc 100644 --- a/engines/saga/shorten.cpp +++ b/engines/saga/shorten.cpp @@ -21,7 +21,9 @@ */ #include "common/scummsys.h" +#include "common/stream.h" #include "common/textconsole.h" +#include "audio/audiostream.h" #include "saga/shorten.h" diff --git a/engines/saga/shorten.h b/engines/saga/shorten.h index 556abaf311..4d4ec328c6 100644 --- a/engines/saga/shorten.h +++ b/engines/saga/shorten.h @@ -30,9 +30,14 @@ #define SOUND_SHORTEN_H #include "common/scummsys.h" -#include "common/stream.h" -#include "audio/audiostream.h" +namespace Audio { +class AudioStream; +} + +namespace Common { +class ReadStream; +} namespace Saga { diff --git a/engines/saga/sound.cpp b/engines/saga/sound.cpp index 0eb6f8a82a..f4e31542fe 100644 --- a/engines/saga/sound.cpp +++ b/engines/saga/sound.cpp @@ -27,8 +27,6 @@ #include "audio/audiostream.h" #include "audio/mixer.h" -#include "audio/decoders/adpcm.h" -#include "audio/decoders/raw.h" namespace Saga { diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index a092e0676d..1661f92cfe 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -1861,7 +1861,7 @@ bool Console::cmdSavedBits(int argc, const char **argv) { for (uint i = 0; i < entries.size(); ++i) { uint16 offset = entries[i].getOffset(); - const Hunk& h = hunks->_table[offset]; + const Hunk& h = hunks->at(offset); if (strcmp(h.type, "SaveBits()") == 0) { byte* memoryPtr = (byte *)h.mem; @@ -1928,7 +1928,7 @@ bool Console::cmdShowSavedBits(int argc, const char **argv) { return true; } - const Hunk& h = hunks->_table[memoryHandle.getOffset()]; + const Hunk& h = hunks->at(memoryHandle.getOffset()); if (strcmp(h.type, "SaveBits()") != 0) { debugPrintf("Invalid address.\n"); @@ -2144,32 +2144,32 @@ bool Console::segmentInfo(int nr) { break; case SEG_TYPE_CLONES: { - CloneTable *ct = (CloneTable *)mobj; + CloneTable &ct = *(CloneTable *)mobj; debugPrintf("clones\n"); - for (uint i = 0; i < ct->_table.size(); i++) - if (ct->isValidEntry(i)) { + for (uint i = 0; i < ct.size(); i++) + if (ct.isValidEntry(i)) { reg_t objpos = make_reg(nr, i); debugPrintf(" [%04x] %s; copy of ", i, _engine->_gamestate->_segMan->getObjectName(objpos)); // Object header - const Object *obj = _engine->_gamestate->_segMan->getObject(ct->_table[i].getPos()); + const Object *obj = _engine->_gamestate->_segMan->getObject(ct[i].getPos()); if (obj) - debugPrintf("[%04x:%04x] %s : %3d vars, %3d methods\n", PRINT_REG(ct->_table[i].getPos()), - _engine->_gamestate->_segMan->getObjectName(ct->_table[i].getPos()), + debugPrintf("[%04x:%04x] %s : %3d vars, %3d methods\n", PRINT_REG(ct[i].getPos()), + _engine->_gamestate->_segMan->getObjectName(ct[i].getPos()), obj->getVarCount(), obj->getMethodCount()); } } break; case SEG_TYPE_LISTS: { - ListTable *lt = (ListTable *)mobj; + ListTable < = *(ListTable *)mobj; debugPrintf("lists\n"); - for (uint i = 0; i < lt->_table.size(); i++) - if (lt->isValidEntry(i)) { + for (uint i = 0; i < lt.size(); i++) + if (lt.isValidEntry(i)) { debugPrintf(" [%04x]: ", i); - printList(&(lt->_table[i])); + printList(<[i]); } } break; @@ -2180,13 +2180,13 @@ bool Console::segmentInfo(int nr) { } case SEG_TYPE_HUNK: { - HunkTable *ht = (HunkTable *)mobj; + HunkTable &ht = *(HunkTable *)mobj; - debugPrintf("hunk (total %d)\n", ht->entries_used); - for (uint i = 0; i < ht->_table.size(); i++) - if (ht->isValidEntry(i)) { + debugPrintf("hunk (total %d)\n", ht.entries_used); + for (uint i = 0; i < ht.size(); i++) + if (ht.isValidEntry(i)) { debugPrintf(" [%04x] %d bytes at %p, type=%s\n", - i, ht->_table[i].size, ht->_table[i].mem, ht->_table[i].type); + i, ht[i].size, ht[i].mem, ht[i].type); } } break; @@ -4362,7 +4362,7 @@ void Console::printList(List *list) { return; } - node = &(nt->_table[pos.getOffset()]); + node = &nt->at(pos.getOffset()); debugPrintf("\t%04x:%04x : %04x:%04x -> %04x:%04x\n", PRINT_REG(pos), PRINT_REG(node->key), PRINT_REG(node->value)); @@ -4392,7 +4392,7 @@ int Console::printNode(reg_t addr) { return 1; } - list = &(lt->_table[addr.getOffset()]); + list = <->at(addr.getOffset()); debugPrintf("%04x:%04x : first x last = (%04x:%04x, %04x:%04x)\n", PRINT_REG(addr), PRINT_REG(list->first), PRINT_REG(list->last)); } else { @@ -4411,7 +4411,7 @@ int Console::printNode(reg_t addr) { debugPrintf("Address does not contain a node\n"); return 1; } - node = &(nt->_table[addr.getOffset()]); + node = &nt->at(addr.getOffset()); debugPrintf("%04x:%04x : prev x next = (%04x:%04x, %04x:%04x); maps %04x:%04x -> %04x:%04x\n", PRINT_REG(addr), PRINT_REG(node->pred), PRINT_REG(node->succ), PRINT_REG(node->key), PRINT_REG(node->value)); diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h index 76c819961e..5f087ebd1a 100644 --- a/engines/sci/detection_tables.h +++ b/engines/sci/detection_tables.h @@ -239,6 +239,19 @@ static const struct ADGameDescription SciGameDescriptions[] = { AD_LISTEND}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO5(GUIO_NOSPEECH, GAMEOPTION_EGA_UNDITHER, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI) }, + // Codename: Iceman - English Atari ST + // Game version 1.041 + // Executable reports "1.002.041" + { "iceman", "",{ + { "resource.map", 0, "066e89b685ad788e06bae0b76d0d37d3", 5718 }, + { "resource.000", 0, "053278385ce910a3f630f2e45e3c10be", 26987 }, + { "resource.001", 0, "32b351072fccf76fc82234d73d28c08b", 438880 }, + { "resource.002", 0, "36670a917550757d57df84c96cf9e6d9", 566667 }, + { "resource.003", 0, "d97a96f1ab91b41cf46a02cc89b0a04e", 624304 }, + { "resource.004", 0, "8613c45fc771d658e5a505b9a4a54f31", 670884 }, + AD_LISTEND }, + Common::EN_ANY, Common::kPlatformAtariST, 0, GUIO5(GUIO_NOSPEECH, GAMEOPTION_EGA_UNDITHER, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI) }, + // Codename: Iceman - English DOS Non-Interactive Demo // Executable scanning reports "0.000.685" {"iceman", "Demo", { @@ -4222,6 +4235,16 @@ static const struct ADGameDescription SciGameDescriptions[] = { AD_LISTEND}, Common::FR_FRA, Common::kPlatformWindows, ADGF_UNSTABLE | ADGF_CD, GUIO4(GUIO_NOASPECT, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI) }, + // Torin's Passage - Russian Windows CD (SoftClub official translate) + // SCI interpreter version 2.100.002 + // VERSION file "1.0" + { "torin", "",{ + { "resource.aud", 0, "f66df699be5ed011b16b3f816cee8a04", 210583510 }, + { "ressci.000", 0, "e672da099fb1663b87c78abc6c8ba2a4", 130622695 }, + { "resmap.000", 0, "643859f8f2be8e7701611e29b3b65208", 9799 }, + AD_LISTEND }, + Common::RU_RUS, Common::kPlatformWindows, ADGF_UNSTABLE | ADGF_CD, GUIO4(GUIO_NOASPECT, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI) }, + // Torin's Passage - English Macintosh {"torin", "", { {"Data1", 0, "63887e33cc282c92dc1f916f54aea8eb", 700786}, diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp index 7850a10006..d5540f72b1 100644 --- a/engines/sci/engine/kgraphics32.cpp +++ b/engines/sci/engine/kgraphics32.cpp @@ -26,8 +26,6 @@ #include "graphics/cursorman.h" #include "graphics/surface.h" -#include "gui/message.h" - #include "sci/sci.h" #include "sci/event.h" #include "sci/resource.h" diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp index fcb65157d8..0cc1e752e1 100644 --- a/engines/sci/engine/savegame.cpp +++ b/engines/sci/engine/savegame.cpp @@ -60,24 +60,125 @@ namespace Sci { #pragma mark - -// Experimental hack: Use syncWithSerializer to sync. By default, this assume -// the object to be synced is a subclass of Serializable and thus tries to invoke -// the saveLoadWithSerializer() method. But it is possible to specialize this -// template function to handle stuff that is not implementing that interface. -template<typename T> -void syncWithSerializer(Common::Serializer &s, T &obj) { +// These are serialization functions for various objects. + +void syncWithSerializer(Common::Serializer &s, Common::Serializable &obj) { + obj.saveLoadWithSerializer(s); +} + +// FIXME: Object could implement Serializable to make use of the function +// above. +void syncWithSerializer(Common::Serializer &s, Object &obj) { obj.saveLoadWithSerializer(s); } +void syncWithSerializer(Common::Serializer &s, reg_t &obj) { + // Segment and offset are accessed directly here + s.syncAsUint16LE(obj._segment); + s.syncAsUint16LE(obj._offset); +} + +void syncWithSerializer(Common::Serializer &s, synonym_t &obj) { + s.syncAsUint16LE(obj.replaceant); + s.syncAsUint16LE(obj.replacement); +} + +void syncWithSerializer(Common::Serializer &s, Class &obj) { + s.syncAsSint32LE(obj.script); + syncWithSerializer(s, obj.reg); +} + +void syncWithSerializer(Common::Serializer &s, List &obj) { + syncWithSerializer(s, obj.first); + syncWithSerializer(s, obj.last); +} + +void syncWithSerializer(Common::Serializer &s, Node &obj) { + syncWithSerializer(s, obj.pred); + syncWithSerializer(s, obj.succ); + syncWithSerializer(s, obj.key); + syncWithSerializer(s, obj.value); +} + +#ifdef ENABLE_SCI32 +void syncWithSerializer(Common::Serializer &s, SciArray<reg_t> &obj) { + byte type = 0; + uint32 size = 0; + + if (s.isSaving()) { + type = (byte)obj.getType(); + size = obj.getSize(); + } + s.syncAsByte(type); + s.syncAsUint32LE(size); + if (s.isLoading()) { + obj.setType((int8)type); + + // HACK: Skip arrays that have a negative type + if ((int8)type < 0) + return; + + obj.setSize(size); + } + + for (uint32 i = 0; i < size; i++) { + reg_t value; + + if (s.isSaving()) + value = obj.getValue(i); + + syncWithSerializer(s, value); + + if (s.isLoading()) + obj.setValue(i, value); + } +} + +void syncWithSerializer(Common::Serializer &s, SciString &obj) { + uint32 size = 0; + + if (s.isSaving()) { + size = obj.getSize(); + s.syncAsUint32LE(size); + } else { + s.syncAsUint32LE(size); + obj.setSize(size); + } + + for (uint32 i = 0; i < size; i++) { + char value = 0; + + if (s.isSaving()) + value = obj.getValue(i); + + s.syncAsByte(value); + + if (s.isLoading()) + obj.setValue(i, value); + } +} +#endif + +#pragma mark - + // By default, sync using syncWithSerializer, which in turn can easily be overloaded. template<typename T> struct DefaultSyncer : Common::BinaryFunction<Common::Serializer, T, void> { void operator()(Common::Serializer &s, T &obj) const { - //obj.saveLoadWithSerializer(s); syncWithSerializer(s, obj); } }; +// Syncer for entries in a segment obj table +template<typename T> +struct SegmentObjTableEntrySyncer : Common::BinaryFunction<Common::Serializer, typename T::Entry &, void> { + void operator()(Common::Serializer &s, typename T::Entry &entry) const { + s.syncAsSint32LE(entry.next_free); + + syncWithSerializer(s, entry.data); + } +}; + /** * Sync a Common::Array using a Common::Serializer. * When saving, this writes the length of the array, then syncs (writes) all entries. @@ -116,18 +217,10 @@ void syncArray(Common::Serializer &s, Common::Array<T> &arr) { sync(s, arr); } - -template<> -void syncWithSerializer(Common::Serializer &s, reg_t &obj) { - // Segment and offset are accessed directly here - s.syncAsUint16LE(obj._segment); - s.syncAsUint16LE(obj._offset); -} - -template<> -void syncWithSerializer(Common::Serializer &s, synonym_t &obj) { - s.syncAsUint16LE(obj.replaceant); - s.syncAsUint16LE(obj.replacement); +template<typename T, class Syncer> +void syncArray(Common::Serializer &s, Common::Array<T> &arr) { + ArraySyncer<T, Syncer> sync; + sync(s, arr); } void SegManager::saveLoadWithSerializer(Common::Serializer &s) { @@ -247,12 +340,6 @@ void SegManager::saveLoadWithSerializer(Common::Serializer &s) { } -template<> -void syncWithSerializer(Common::Serializer &s, Class &obj) { - s.syncAsSint32LE(obj.script); - syncWithSerializer(s, obj.reg); -} - static void sync_SavegameMetadata(Common::Serializer &s, SavegameMetadata &obj) { s.syncString(obj.name); s.syncVersion(CURRENT_SAVEGAME_VERSION); @@ -331,102 +418,13 @@ void Object::saveLoadWithSerializer(Common::Serializer &s) { syncArray<reg_t>(s, _variables); } -template<> -void syncWithSerializer(Common::Serializer &s, SegmentObjTable<Clone>::Entry &obj) { - s.syncAsSint32LE(obj.next_free); - - syncWithSerializer<Object>(s, obj); -} - -template<> -void syncWithSerializer(Common::Serializer &s, SegmentObjTable<List>::Entry &obj) { - s.syncAsSint32LE(obj.next_free); - - syncWithSerializer(s, obj.first); - syncWithSerializer(s, obj.last); -} - -template<> -void syncWithSerializer(Common::Serializer &s, SegmentObjTable<Node>::Entry &obj) { - s.syncAsSint32LE(obj.next_free); - - syncWithSerializer(s, obj.pred); - syncWithSerializer(s, obj.succ); - syncWithSerializer(s, obj.key); - syncWithSerializer(s, obj.value); -} - -#ifdef ENABLE_SCI32 -template<> -void syncWithSerializer(Common::Serializer &s, SegmentObjTable<SciArray<reg_t> >::Entry &obj) { - s.syncAsSint32LE(obj.next_free); - - byte type = 0; - uint32 size = 0; - - if (s.isSaving()) { - type = (byte)obj.getType(); - size = obj.getSize(); - } - s.syncAsByte(type); - s.syncAsUint32LE(size); - if (s.isLoading()) { - obj.setType((int8)type); - - // HACK: Skip arrays that have a negative type - if ((int8)type < 0) - return; - - obj.setSize(size); - } - - for (uint32 i = 0; i < size; i++) { - reg_t value; - - if (s.isSaving()) - value = obj.getValue(i); - - syncWithSerializer(s, value); - - if (s.isLoading()) - obj.setValue(i, value); - } -} - -template<> -void syncWithSerializer(Common::Serializer &s, SegmentObjTable<SciString>::Entry &obj) { - s.syncAsSint32LE(obj.next_free); - - uint32 size = 0; - - if (s.isSaving()) { - size = obj.getSize(); - s.syncAsUint32LE(size); - } else { - s.syncAsUint32LE(size); - obj.setSize(size); - } - - for (uint32 i = 0; i < size; i++) { - char value = 0; - - if (s.isSaving()) - value = obj.getValue(i); - - s.syncAsByte(value); - - if (s.isLoading()) - obj.setValue(i, value); - } -} -#endif template<typename T> void sync_Table(Common::Serializer &s, T &obj) { s.syncAsSint32LE(obj.first_free); s.syncAsSint32LE(obj.entries_used); - syncArray<typename T::Entry>(s, obj._table); + syncArray<typename T::Entry, SegmentObjTableEntrySyncer<T> >(s, obj._table); } void CloneTable::saveLoadWithSerializer(Common::Serializer &s) { @@ -903,7 +901,7 @@ void SegManager::reconstructClones() { if (!isUsed) continue; - CloneTable::Entry &seeker = ct->_table[j]; + CloneTable::value_type &seeker = ct->at(j); const Object *baseObj = getObject(seeker.getSpeciesSelector()); seeker.cloneFromObject(baseObj); if (!baseObj) { diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index 7d70f30d55..b017e62df7 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -741,13 +741,13 @@ void logKernelCall(const KernelFunction *kernelCall, const KernelSubFunction *ke switch (mobj->getType()) { case SEG_TYPE_HUNK: { - HunkTable *ht = (HunkTable *)mobj; + HunkTable &ht = *(HunkTable *)mobj; int index = argv[parmNr].getOffset(); - if (ht->isValidEntry(index)) { + if (ht.isValidEntry(index)) { // NOTE: This ", deleted" isn't as useful as it could // be because it prints the status _after_ the kernel // call. - debugN(" ('%s' hunk%s)", ht->_table[index].type, ht->_table[index].mem ? "" : ", deleted"); + debugN(" ('%s' hunk%s)", ht[index].type, ht[index].mem ? "" : ", deleted"); } else debugN(" (INVALID hunk ref)"); break; diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp index 8090b1861d..95e3cd15f9 100644 --- a/engines/sci/engine/seg_manager.cpp +++ b/engines/sci/engine/seg_manager.cpp @@ -247,9 +247,9 @@ Object *SegManager::getObject(reg_t pos) const { if (mobj != NULL) { if (mobj->getType() == SEG_TYPE_CLONES) { - CloneTable *ct = (CloneTable *)mobj; - if (ct->isValidEntry(pos.getOffset())) - obj = &(ct->_table[pos.getOffset()]); + CloneTable &ct = *(CloneTable *)mobj; + if (ct.isValidEntry(pos.getOffset())) + obj = &(ct[pos.getOffset()]); else warning("getObject(): Trying to get an invalid object"); } else if (mobj->getType() == SEG_TYPE_SCRIPT) { @@ -313,7 +313,7 @@ reg_t SegManager::findObjectByName(const Common::String &name, int index) { } else if (mobj->getType() == SEG_TYPE_CLONES) { // It's clone table, scan all objects in it const CloneTable *ct = (const CloneTable *)mobj; - for (uint idx = 0; idx < ct->_table.size(); ++idx) { + for (uint idx = 0; idx < ct->size(); ++idx) { if (!ct->isValidEntry(idx)) continue; @@ -404,7 +404,7 @@ reg_t SegManager::allocateHunkEntry(const char *hunk_type, int size) { offset = table->allocEntry(); reg_t addr = make_reg(_hunksSegId, offset); - Hunk *h = &(table->_table[offset]); + Hunk *h = &table->at(offset); if (!h) return NULL_REG; @@ -424,7 +424,7 @@ byte *SegManager::getHunkPointer(reg_t addr) { return NULL; } - return (byte *)ht->_table[addr.getOffset()].mem; + return (byte *)ht->at(addr.getOffset()).mem; } Clone *SegManager::allocateClone(reg_t *addr) { @@ -439,7 +439,7 @@ Clone *SegManager::allocateClone(reg_t *addr) { offset = table->allocEntry(); *addr = make_reg(_clonesSegId, offset); - return &(table->_table[offset]); + return &table->at(offset); } List *SegManager::allocateList(reg_t *addr) { @@ -453,7 +453,7 @@ List *SegManager::allocateList(reg_t *addr) { offset = table->allocEntry(); *addr = make_reg(_listsSegId, offset); - return &(table->_table[offset]); + return &table->at(offset); } Node *SegManager::allocateNode(reg_t *addr) { @@ -467,7 +467,7 @@ Node *SegManager::allocateNode(reg_t *addr) { offset = table->allocEntry(); *addr = make_reg(_nodesSegId, offset); - return &(table->_table[offset]); + return &table->at(offset); } reg_t SegManager::newNode(reg_t value, reg_t key) { @@ -486,14 +486,14 @@ List *SegManager::lookupList(reg_t addr) { return NULL; } - ListTable *lt = (ListTable *)_heap[addr.getSegment()]; + ListTable < = *(ListTable *)_heap[addr.getSegment()]; - if (!lt->isValidEntry(addr.getOffset())) { + if (!lt.isValidEntry(addr.getOffset())) { error("Attempt to use non-list %04x:%04x as list", PRINT_REG(addr)); return NULL; } - return &(lt->_table[addr.getOffset()]); + return &(lt[addr.getOffset()]); } Node *SegManager::lookupNode(reg_t addr, bool stopOnDiscarded) { @@ -507,9 +507,9 @@ Node *SegManager::lookupNode(reg_t addr, bool stopOnDiscarded) { return NULL; } - NodeTable *nt = (NodeTable *)_heap[addr.getSegment()]; + NodeTable &nt = *(NodeTable *)_heap[addr.getSegment()]; - if (!nt->isValidEntry(addr.getOffset())) { + if (!nt.isValidEntry(addr.getOffset())) { if (!stopOnDiscarded) return NULL; @@ -517,7 +517,7 @@ Node *SegManager::lookupNode(reg_t addr, bool stopOnDiscarded) { return NULL; } - return &(nt->_table[addr.getOffset()]); + return &(nt[addr.getOffset()]); } SegmentRef SegManager::dereference(reg_t pointer) { @@ -873,32 +873,32 @@ SciArray<reg_t> *SegManager::allocateArray(reg_t *addr) { offset = table->allocEntry(); *addr = make_reg(_arraysSegId, offset); - return &(table->_table[offset]); + return &table->at(offset); } SciArray<reg_t> *SegManager::lookupArray(reg_t addr) { if (_heap[addr.getSegment()]->getType() != SEG_TYPE_ARRAY) error("Attempt to use non-array %04x:%04x as array", PRINT_REG(addr)); - ArrayTable *arrayTable = (ArrayTable *)_heap[addr.getSegment()]; + ArrayTable &arrayTable = *(ArrayTable *)_heap[addr.getSegment()]; - if (!arrayTable->isValidEntry(addr.getOffset())) + if (!arrayTable.isValidEntry(addr.getOffset())) error("Attempt to use non-array %04x:%04x as array", PRINT_REG(addr)); - return &(arrayTable->_table[addr.getOffset()]); + return &(arrayTable[addr.getOffset()]); } void SegManager::freeArray(reg_t addr) { if (_heap[addr.getSegment()]->getType() != SEG_TYPE_ARRAY) error("Attempt to use non-array %04x:%04x as array", PRINT_REG(addr)); - ArrayTable *arrayTable = (ArrayTable *)_heap[addr.getSegment()]; + ArrayTable &arrayTable = *(ArrayTable *)_heap[addr.getSegment()]; - if (!arrayTable->isValidEntry(addr.getOffset())) + if (!arrayTable.isValidEntry(addr.getOffset())) error("Attempt to use non-array %04x:%04x as array", PRINT_REG(addr)); - arrayTable->_table[addr.getOffset()].destroy(); - arrayTable->freeEntry(addr.getOffset()); + arrayTable[addr.getOffset()].destroy(); + arrayTable.freeEntry(addr.getOffset()); } SciString *SegManager::allocateString(reg_t *addr) { @@ -913,32 +913,32 @@ SciString *SegManager::allocateString(reg_t *addr) { offset = table->allocEntry(); *addr = make_reg(_stringSegId, offset); - return &(table->_table[offset]); + return &table->at(offset); } SciString *SegManager::lookupString(reg_t addr) { if (_heap[addr.getSegment()]->getType() != SEG_TYPE_STRING) error("lookupString: Attempt to use non-string %04x:%04x as string", PRINT_REG(addr)); - StringTable *stringTable = (StringTable *)_heap[addr.getSegment()]; + StringTable &stringTable = *(StringTable *)_heap[addr.getSegment()]; - if (!stringTable->isValidEntry(addr.getOffset())) + if (!stringTable.isValidEntry(addr.getOffset())) error("lookupString: Attempt to use non-string %04x:%04x as string", PRINT_REG(addr)); - return &(stringTable->_table[addr.getOffset()]); + return &(stringTable[addr.getOffset()]); } void SegManager::freeString(reg_t addr) { if (_heap[addr.getSegment()]->getType() != SEG_TYPE_STRING) error("freeString: Attempt to use non-string %04x:%04x as string", PRINT_REG(addr)); - StringTable *stringTable = (StringTable *)_heap[addr.getSegment()]; + StringTable &stringTable = *(StringTable *)_heap[addr.getSegment()]; - if (!stringTable->isValidEntry(addr.getOffset())) + if (!stringTable.isValidEntry(addr.getOffset())) error("freeString: Attempt to use non-string %04x:%04x as string", PRINT_REG(addr)); - stringTable->_table[addr.getOffset()].destroy(); - stringTable->freeEntry(addr.getOffset()); + stringTable[addr.getOffset()].destroy(); + stringTable.freeEntry(addr.getOffset()); } #endif diff --git a/engines/sci/engine/segment.cpp b/engines/sci/engine/segment.cpp index bb90698e6a..2cff799f4b 100644 --- a/engines/sci/engine/segment.cpp +++ b/engines/sci/engine/segment.cpp @@ -97,7 +97,7 @@ Common::Array<reg_t> CloneTable::listAllOutgoingReferences(reg_t addr) const { error("Unexpected request for outgoing references from clone at %04x:%04x", PRINT_REG(addr)); } - const Clone *clone = &(_table[addr.getOffset()]); + const Clone *clone = &at(addr.getOffset()); // Emit all member variables (including references to the 'super' delegate) for (uint i = 0; i < clone->getVarCount(); i++) @@ -112,7 +112,7 @@ Common::Array<reg_t> CloneTable::listAllOutgoingReferences(reg_t addr) const { void CloneTable::freeAtAddress(SegManager *segMan, reg_t addr) { #ifdef GC_DEBUG - Object *victim_obj = &(_table[addr.getOffset()]); + Object *victim_obj = &at(addr.getOffset()); if (!(victim_obj->_flags & OBJECT_FLAG_FREED)) warning("[GC] Clone %04x:%04x not reachable and not freed (freeing now)", PRINT_REG(addr)); @@ -208,7 +208,7 @@ Common::Array<reg_t> ListTable::listAllOutgoingReferences(reg_t addr) const { error("Invalid list referenced for outgoing references: %04x:%04x", PRINT_REG(addr)); } - const List *list = &(_table[addr.getOffset()]); + const List *list = &at(addr.getOffset()); tmp.push_back(list->first); tmp.push_back(list->last); @@ -225,7 +225,7 @@ Common::Array<reg_t> NodeTable::listAllOutgoingReferences(reg_t addr) const { if (!isValidEntry(addr.getOffset())) { error("Invalid node referenced for outgoing references: %04x:%04x", PRINT_REG(addr)); } - const Node *node = &(_table[addr.getOffset()]); + const Node *node = &at(addr.getOffset()); // We need all four here. Can't just stick with 'pred' OR 'succ' because node operations allow us // to walk around from any given node @@ -252,13 +252,13 @@ SegmentRef DynMem::dereference(reg_t pointer) { SegmentRef ArrayTable::dereference(reg_t pointer) { SegmentRef ret; ret.isRaw = false; - ret.maxSize = _table[pointer.getOffset()].getSize() * 2; - ret.reg = _table[pointer.getOffset()].getRawData(); + ret.maxSize = at(pointer.getOffset()).getSize() * 2; + ret.reg = at(pointer.getOffset()).getRawData(); return ret; } void ArrayTable::freeAtAddress(SegManager *segMan, reg_t sub_addr) { - _table[sub_addr.getOffset()].destroy(); + at(sub_addr.getOffset()).destroy(); freeEntry(sub_addr.getOffset()); } @@ -268,7 +268,7 @@ Common::Array<reg_t> ArrayTable::listAllOutgoingReferences(reg_t addr) const { error("Invalid array referenced for outgoing references: %04x:%04x", PRINT_REG(addr)); } - const SciArray<reg_t> *array = &(_table[addr.getOffset()]); + const SciArray<reg_t> *array = &at(addr.getOffset()); for (uint32 i = 0; i < array->getSize(); i++) { reg_t value = array->getValue(i); @@ -305,8 +305,8 @@ void SciString::fromString(const Common::String &string) { SegmentRef StringTable::dereference(reg_t pointer) { SegmentRef ret; ret.isRaw = true; - ret.maxSize = _table[pointer.getOffset()].getSize(); - ret.raw = (byte *)_table[pointer.getOffset()].getRawData(); + ret.maxSize = at(pointer.getOffset()).getSize(); + ret.raw = (byte *)at(pointer.getOffset()).getRawData(); return ret; } diff --git a/engines/sci/engine/segment.h b/engines/sci/engine/segment.h index 2699bc2e5b..50c77d0538 100644 --- a/engines/sci/engine/segment.h +++ b/engines/sci/engine/segment.h @@ -210,16 +210,17 @@ struct Hunk { template<typename T> struct SegmentObjTable : public SegmentObj { typedef T value_type; - struct Entry : public T { + struct Entry { + T data; int next_free; /* Only used for free entries */ }; enum { HEAPENTRY_INVALID = -1 }; - int first_free; /**< Beginning of a singly linked list for entries */ int entries_used; /**< Statistical information */ - Common::Array<Entry> _table; + typedef Common::Array<Entry> ArrayType; + ArrayType _table; public: SegmentObjTable(SegmentType type) : SegmentObj(type) { @@ -272,6 +273,14 @@ public: tmp.push_back(make_reg(segId, i)); return tmp; } + + uint size() const { return _table.size(); } + + T &at(uint index) { return _table[index].data; } + const T &at(uint index) const { return _table[index].data; } + + T &operator[](uint index) { return at(index); } + const T &operator[](uint index) const { return at(index); } }; @@ -323,8 +332,8 @@ struct HunkTable : public SegmentObjTable<Hunk> { } void freeEntryContents(int idx) { - free(_table[idx].mem); - _table[idx].mem = 0; + free(at(idx).mem); + at(idx).mem = 0; } virtual void freeEntry(int idx) { @@ -502,7 +511,7 @@ struct StringTable : public SegmentObjTable<SciString> { StringTable() : SegmentObjTable<SciString>(SEG_TYPE_STRING) {} virtual void freeAtAddress(SegManager *segMan, reg_t sub_addr) { - _table[sub_addr.getOffset()].destroy(); + at(sub_addr.getOffset()).destroy(); freeEntry(sub_addr.getOffset()); } diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp index aa464cdc19..5e82e4a729 100644 --- a/engines/sci/sound/drivers/midi.cpp +++ b/engines/sci/sound/drivers/midi.cpp @@ -27,7 +27,7 @@ #include "common/memstream.h" #include "common/system.h" -#include "audio/fmopl.h" +#include "audio/mididrv.h" #include "sci/resource.h" #include "sci/engine/features.h" diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h index a610f32d89..047f63b3b7 100644 --- a/engines/sci/sound/music.h +++ b/engines/sci/sound/music.h @@ -27,12 +27,16 @@ #include "common/mutex.h" #include "audio/mixer.h" -#include "audio/audiostream.h" #include "sci/sci.h" #include "sci/resource.h" #include "sci/sound/drivers/mididriver.h" +namespace Audio { +class LoopingAudioStream; +class RewindableAudioStream; +} + namespace Sci { enum SoundStatus { diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp index e7b25eb1fc..fe33ea1feb 100644 --- a/engines/sci/sound/soundcmd.cpp +++ b/engines/sci/sound/soundcmd.cpp @@ -21,6 +21,8 @@ */ #include "common/config-manager.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" #include "sci/sound/audio.h" #include "sci/sound/music.h" #include "sci/sound/soundcmd.h" diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp index 21c7428621..8a6b545bf2 100644 --- a/engines/scumm/dialogs.cpp +++ b/engines/scumm/dialogs.cpp @@ -33,10 +33,8 @@ #include "scummhelp.h" #endif -#include "gui/about.h" - #include "gui/gui-manager.h" -#include "gui/widgets/list.h" +#include "gui/widget.h" #include "gui/ThemeEval.h" #include "scumm/dialogs.h" @@ -45,14 +43,12 @@ #include "scumm/imuse/imuse.h" #include "scumm/imuse_digi/dimuse.h" #include "scumm/verbs.h" -#include "audio/mididrv.h" -#include "audio/mixer.h" #ifndef DISABLE_HELP #include "scumm/help.h" #endif -#ifdef SMALL_SCREEN_DEVICE +#ifdef GUI_ENABLE_KEYSDIALOG #include "gui/KeysDialog.h" #endif diff --git a/engines/scumm/dialogs.h b/engines/scumm/dialogs.h index 08222dd8cd..bd0645597e 100644 --- a/engines/scumm/dialogs.h +++ b/engines/scumm/dialogs.h @@ -24,15 +24,13 @@ #define SCUMM_DIALOGS_H #include "common/str.h" +#include "common/keyboard.h" #include "gui/dialog.h" -#include "gui/widget.h" #include "engines/dialogs.h" -#include "scumm/detection.h" - namespace GUI { -class ListWidget; class CommandSender; +class StaticTextWidget; } diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp index 8483a8a402..0a3a56ceda 100644 --- a/engines/scumm/he/animation_he.cpp +++ b/engines/scumm/he/animation_he.cpp @@ -22,16 +22,21 @@ #ifdef ENABLE_HE +#include "common/scummsys.h" + #include "scumm/he/animation_he.h" #include "scumm/he/intern_he.h" -#include "audio/audiostream.h" #include "video/smk_decoder.h" #ifdef USE_BINK #include "video/bink_decoder.h" #endif +namespace Audio { +class Mixer; +} + namespace Scumm { MoviePlayer::MoviePlayer(ScummEngine_v90he *vm, Audio::Mixer *mixer) : _vm(vm) { diff --git a/engines/scumm/he/animation_he.h b/engines/scumm/he/animation_he.h index 677a4b4247..6891ed8bf0 100644 --- a/engines/scumm/he/animation_he.h +++ b/engines/scumm/he/animation_he.h @@ -23,7 +23,9 @@ #if !defined(SCUMM_HE_ANIMATION_H) && defined(ENABLE_HE) #define SCUMM_HE_ANIMATION_H -#include "audio/mixer.h" +namespace Audio { +class Mixer; +} namespace Common { class String; diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index b806a9f3cc..9a456b86c0 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -34,14 +34,10 @@ #include "common/timer.h" #include "common/util.h" +#include "audio/audiostream.h" #include "audio/decoders/adpcm.h" -#include "audio/decoders/flac.h" -#include "audio/mididrv.h" #include "audio/mixer.h" -#include "audio/decoders/mp3.h" #include "audio/decoders/raw.h" -#include "audio/decoders/voc.h" -#include "audio/decoders/vorbis.h" #include "audio/decoders/wave.h" namespace Scumm { diff --git a/engines/scumm/imuse_digi/dimuse.h b/engines/scumm/imuse_digi/dimuse.h index f04c2f7826..11b1ea678b 100644 --- a/engines/scumm/imuse_digi/dimuse.h +++ b/engines/scumm/imuse_digi/dimuse.h @@ -34,8 +34,10 @@ #include "scumm/music.h" #include "scumm/sound.h" -#include "audio/mixer.h" -#include "audio/audiostream.h" +namespace Audio { +class AudioStream; +class Mixer; +} namespace Scumm { diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp index 78d05c2051..b2ff3aadbb 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -22,8 +22,8 @@ #include "common/scummsys.h" -#include "common/util.h" +#include "audio/audiostream.h" #include "audio/decoders/flac.h" #include "audio/decoders/voc.h" #include "audio/decoders/vorbis.h" @@ -31,8 +31,6 @@ #include "scumm/resource.h" #include "scumm/scumm.h" -#include "scumm/util.h" -#include "scumm/imuse_digi/dimuse.h" #include "scumm/imuse_digi/dimuse_bndmgr.h" #include "scumm/imuse_digi/dimuse_codecs.h" #include "scumm/imuse_digi/dimuse_sndmgr.h" diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.h b/engines/scumm/imuse_digi/dimuse_sndmgr.h index aebf4d7f11..2f91405588 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.h +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.h @@ -25,13 +25,20 @@ #include "common/scummsys.h" -#include "audio/audiostream.h" -#include "scumm/imuse_digi/dimuse_bndmgr.h" + +namespace Audio { +class SeekableAudioStream; +} + +namespace Common { +class SeekableReadStream; +} namespace Scumm { class ScummEngine; class BundleMgr; +class BundleDirCache; class ImuseDigiSndMgr { public: diff --git a/engines/scumm/imuse_digi/dimuse_track.h b/engines/scumm/imuse_digi/dimuse_track.h index 7e360268e5..a007903139 100644 --- a/engines/scumm/imuse_digi/dimuse_track.h +++ b/engines/scumm/imuse_digi/dimuse_track.h @@ -24,6 +24,11 @@ #define SCUMM_IMUSE_DIGI_TRACK_H #include "common/scummsys.h" +#include "audio/mixer.h" + +namespace Audio { +class QueuingAudioStream; +} namespace Scumm { diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp index 1234eda3cc..12047635a0 100644 --- a/engines/scumm/input.cpp +++ b/engines/scumm/input.cpp @@ -25,9 +25,6 @@ #include "common/system.h" #include "common/translation.h" -#include "gui/message.h" -#include "gui/gui-manager.h" - #include "scumm/debugger.h" #include "scumm/dialogs.h" #include "scumm/insane/insane.h" diff --git a/engines/scumm/midiparser_ro.cpp b/engines/scumm/midiparser_ro.cpp index 35eb9f7eb7..5fc1ae41ab 100644 --- a/engines/scumm/midiparser_ro.cpp +++ b/engines/scumm/midiparser_ro.cpp @@ -22,9 +22,7 @@ #include "audio/midiparser.h" -#include "audio/mididrv.h" #include "common/textconsole.h" -#include "common/util.h" namespace Scumm { diff --git a/engines/scumm/players/player_ad.h b/engines/scumm/players/player_ad.h index 9cd1a06261..1e665e82d5 100644 --- a/engines/scumm/players/player_ad.h +++ b/engines/scumm/players/player_ad.h @@ -25,8 +25,6 @@ #include "scumm/music.h" -#include "audio/audiostream.h" - #include "common/mutex.h" namespace OPL { @@ -36,6 +34,7 @@ class OPL; namespace Scumm { class ScummEngine; +class Serializer; /** * Sound output for v3/v4 AdLib data. diff --git a/engines/scumm/players/player_apple2.h b/engines/scumm/players/player_apple2.h index 8efb951f20..2e897d58f4 100644 --- a/engines/scumm/players/player_apple2.h +++ b/engines/scumm/players/player_apple2.h @@ -25,11 +25,9 @@ #include "common/mutex.h" #include "common/scummsys.h" -#include "common/memstream.h" #include "scumm/music.h" #include "audio/audiostream.h" #include "audio/mixer.h" -#include "audio/softsynth/sid.h" namespace Scumm { diff --git a/engines/scumm/players/player_mac.cpp b/engines/scumm/players/player_mac.cpp index 634fd2de2b..87406f4e34 100644 --- a/engines/scumm/players/player_mac.cpp +++ b/engines/scumm/players/player_mac.cpp @@ -22,7 +22,6 @@ #include "common/macresman.h" #include "engines/engine.h" -#include "gui/message.h" #include "scumm/players/player_mac.h" #include "scumm/resource.h" #include "scumm/scumm.h" diff --git a/engines/scumm/players/player_v2cms.cpp b/engines/scumm/players/player_v2cms.cpp index 08321932c3..1a1cd1ed8c 100644 --- a/engines/scumm/players/player_v2cms.cpp +++ b/engines/scumm/players/player_v2cms.cpp @@ -22,7 +22,6 @@ #include "scumm/players/player_v2cms.h" #include "scumm/scumm.h" -#include "audio/mididrv.h" #include "audio/mixer.h" #include "audio/softsynth/cms.h" diff --git a/engines/scumm/players/player_v3m.h b/engines/scumm/players/player_v3m.h index 81dda801fc..645f1fb1c9 100644 --- a/engines/scumm/players/player_v3m.h +++ b/engines/scumm/players/player_v3m.h @@ -28,10 +28,10 @@ #include "common/mutex.h" #include "scumm/music.h" #include "scumm/players/player_mac.h" -#include "audio/audiostream.h" -#include "audio/mixer.h" +namespace Audio { class Mixer; +} namespace Scumm { diff --git a/engines/scumm/players/player_v5m.h b/engines/scumm/players/player_v5m.h index f60a3f9346..152aa1541a 100644 --- a/engines/scumm/players/player_v5m.h +++ b/engines/scumm/players/player_v5m.h @@ -28,10 +28,10 @@ #include "common/mutex.h" #include "scumm/music.h" #include "scumm/players/player_mac.h" -#include "audio/audiostream.h" -#include "audio/mixer.h" +namespace Audio { class Mixer; +} namespace Scumm { diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index f3df24ff51..40dc83c7f3 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -41,8 +41,6 @@ #include "scumm/he/sprite_he.h" #include "scumm/verbs.h" -#include "audio/mixer.h" - #include "backends/audiocd/audiocd.h" #include "graphics/thumbnail.h" diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index d9148ed300..e7118616ba 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -30,7 +30,6 @@ #include "engines/util.h" #include "gui/message.h" -#include "gui/gui-manager.h" #include "graphics/cursorman.h" diff --git a/engines/scumm/smush/smush_mixer.cpp b/engines/scumm/smush/smush_mixer.cpp index 42e8f645be..445186d62b 100644 --- a/engines/scumm/smush/smush_mixer.cpp +++ b/engines/scumm/smush/smush_mixer.cpp @@ -21,14 +21,11 @@ */ -#include "common/util.h" - #include "scumm/smush/smush_mixer.h" #include "scumm/smush/channel.h" #include "scumm/scumm.h" -#include "scumm/sound.h" -#include "scumm/imuse/imuse.h" +#include "audio/audiostream.h" #include "audio/mixer.h" #include "audio/decoders/raw.h" diff --git a/engines/scumm/smush/smush_mixer.h b/engines/scumm/smush/smush_mixer.h index 18ec7f96fb..1bd6adac16 100644 --- a/engines/scumm/smush/smush_mixer.h +++ b/engines/scumm/smush/smush_mixer.h @@ -28,6 +28,10 @@ #include "common/mutex.h" #include "scumm/sound.h" +namespace Audio { +class QueuingAudioStream; +} + namespace Scumm { class SmushChannel; diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index 05c7ff2d9a..2ca2579b54 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -20,8 +20,6 @@ * */ -#include "engines/engine.h" - #include "common/config-manager.h" #include "common/file.h" #include "common/system.h" @@ -30,14 +28,11 @@ #include "graphics/cursorman.h" #include "graphics/palette.h" -#include "scumm/bomp.h" #include "scumm/file.h" #include "scumm/imuse_digi/dimuse.h" -#include "scumm/imuse/imuse.h" #include "scumm/scumm.h" #include "scumm/scumm_v7.h" #include "scumm/sound.h" -#include "scumm/util.h" #include "scumm/smush/channel.h" #include "scumm/smush/codec37.h" #include "scumm/smush/codec47.h" @@ -47,6 +42,7 @@ #include "scumm/insane/insane.h" +#include "audio/audiostream.h" #include "audio/mixer.h" #include "audio/decoders/mp3.h" #include "audio/decoders/raw.h" diff --git a/engines/scumm/smush/smush_player.h b/engines/scumm/smush/smush_player.h index 81c498a516..b0d6e6a9f0 100644 --- a/engines/scumm/smush/smush_player.h +++ b/engines/scumm/smush/smush_player.h @@ -26,6 +26,10 @@ #include "common/util.h" #include "scumm/sound.h" +namespace Audio { +class QueuingAudioStream; +} + namespace Scumm { class ScummEngine_v7; diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 404bdd022c..f66452e99c 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -35,9 +35,9 @@ #include "scumm/resource.h" #include "scumm/scumm.h" #include "scumm/sound.h" -#include "scumm/util.h" -#include "audio/decoders/adpcm.h" +#include "audio/audiostream.h" +#include "audio/timestamp.h" #include "audio/decoders/flac.h" #include "audio/mididrv.h" #include "audio/mixer.h" @@ -45,7 +45,6 @@ #include "audio/decoders/raw.h" #include "audio/decoders/voc.h" #include "audio/decoders/vorbis.h" -#include "audio/decoders/wave.h" namespace Scumm { diff --git a/engines/scumm/sound.h b/engines/scumm/sound.h index a479ad5731..8c11c7b5b2 100644 --- a/engines/scumm/sound.h +++ b/engines/scumm/sound.h @@ -24,23 +24,17 @@ #define SCUMM_SOUND_H #include "common/scummsys.h" -#include "audio/audiostream.h" +#include "common/str.h" #include "audio/mididrv.h" #include "audio/mixer.h" #include "backends/audiocd/audiocd.h" #include "scumm/saveload.h" -namespace Audio { -class Mixer; -} - namespace Scumm { class ScummEngine; -class BaseScummFile; struct MP3OffsetTable; -struct SaveLoadEntry; enum { kTalkSoundID = 10000 diff --git a/engines/sherlock/debugger.cpp b/engines/sherlock/debugger.cpp index 39f8da3806..55243c4bc7 100644 --- a/engines/sherlock/debugger.cpp +++ b/engines/sherlock/debugger.cpp @@ -26,9 +26,6 @@ #include "sherlock/scalpel/scalpel.h" #include "sherlock/scalpel/scalpel_debugger.h" #include "sherlock/tattoo/tattoo_debugger.h" -#include "audio/mixer.h" -#include "audio/decoders/aiff.h" -#include "audio/decoders/wave.h" #include "common/str-array.h" namespace Sherlock { diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp index 5ea3318bd7..c52c30191a 100644 --- a/engines/sherlock/music.cpp +++ b/engines/sherlock/music.cpp @@ -26,6 +26,7 @@ #include "sherlock/sherlock.h" #include "sherlock/music.h" #include "sherlock/scalpel/drivers/mididriver.h" +#include "audio/audiostream.h" // for Miles Audio (Sherlock Holmes 2) #include "audio/miles.h" // for 3DO digital music diff --git a/engines/sherlock/music.h b/engines/sherlock/music.h index 186e2aa2dc..b1eba1d889 100644 --- a/engines/sherlock/music.h +++ b/engines/sherlock/music.h @@ -23,12 +23,9 @@ #ifndef SHERLOCK_MUSIC_H #define SHERLOCK_MUSIC_H -#include "audio/midiplayer.h" #include "audio/midiparser.h" -//#include "audio/mididrv.h" -#include "sherlock/scalpel/drivers/mididriver.h" +#include "audio/mididrv.h" // for 3DO digital music -#include "audio/audiostream.h" #include "audio/mixer.h" #include "common/mutex.h" #include "common/str-array.h" diff --git a/engines/sherlock/scalpel/3do/movie_decoder.cpp b/engines/sherlock/scalpel/3do/movie_decoder.cpp index da4d08ca47..da0d16c145 100644 --- a/engines/sherlock/scalpel/3do/movie_decoder.cpp +++ b/engines/sherlock/scalpel/3do/movie_decoder.cpp @@ -25,7 +25,6 @@ #include "common/textconsole.h" #include "audio/audiostream.h" -#include "audio/decoders/raw.h" #include "audio/decoders/3do.h" #include "sherlock/scalpel/3do/movie_decoder.h" diff --git a/engines/sherlock/scalpel/drivers/adlib.cpp b/engines/sherlock/scalpel/drivers/adlib.cpp index 29a39f0c39..3d29d0c5ed 100644 --- a/engines/sherlock/scalpel/drivers/adlib.cpp +++ b/engines/sherlock/scalpel/drivers/adlib.cpp @@ -21,14 +21,12 @@ */ #include "sherlock/sherlock.h" -#include "sherlock/scalpel/drivers/mididriver.h" -#include "common/file.h" #include "common/system.h" #include "common/textconsole.h" #include "audio/fmopl.h" -#include "audio/softsynth/emumidi.h" +#include "audio/mididrv.h" namespace Sherlock { diff --git a/engines/sherlock/scalpel/scalpel_debugger.cpp b/engines/sherlock/scalpel/scalpel_debugger.cpp index 1495c76b43..02b39ade9b 100644 --- a/engines/sherlock/scalpel/scalpel_debugger.cpp +++ b/engines/sherlock/scalpel/scalpel_debugger.cpp @@ -22,10 +22,9 @@ #include "sherlock/scalpel/scalpel_debugger.h" #include "sherlock/sherlock.h" +#include "audio/audiostream.h" #include "audio/mixer.h" -#include "audio/decoders/3do.h" #include "audio/decoders/aiff.h" -#include "audio/decoders/wave.h" namespace Sherlock { diff --git a/engines/sherlock/scalpel/scalpel_journal.cpp b/engines/sherlock/scalpel/scalpel_journal.cpp index d6f8021e5b..151d986d81 100644 --- a/engines/sherlock/scalpel/scalpel_journal.cpp +++ b/engines/sherlock/scalpel/scalpel_journal.cpp @@ -485,11 +485,6 @@ int ScalpelJournal::getSearchString(bool printError) { screen.makeField(Common::Rect(12, 185, 307, 196)); - screen.fillRect(Common::Rect(12, 185, 307, 186), BUTTON_BOTTOM); - screen.vLine(12, 185, 195, BUTTON_BOTTOM); - screen.hLine(13, 195, 306, BUTTON_TOP); - screen.hLine(306, 186, 195, BUTTON_TOP); - if (printError) { screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH - screen.stringWidth(_fixedTextSearchNotFound)) / 2, 185), INV_FOREGROUND, "%s", _fixedTextSearchNotFound.c_str()); diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h index 0a0ff83d1f..a82aaf6730 100644 --- a/engines/sherlock/sound.h +++ b/engines/sherlock/sound.h @@ -25,11 +25,8 @@ #include "common/scummsys.h" #include "common/str.h" -#include "audio/audiostream.h" #include "audio/mixer.h" #include "access/files.h" -#include "audio/midiplayer.h" -#include "audio/midiparser.h" namespace Sherlock { diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp index b543472513..3c6bf44837 100644 --- a/engines/sherlock/talk.cpp +++ b/engines/sherlock/talk.cpp @@ -28,9 +28,11 @@ #include "sherlock/scalpel/scalpel_talk.h" #include "sherlock/scalpel/scalpel_user_interface.h" #include "sherlock/tattoo/tattoo.h" +#include "sherlock/tattoo/tattoo_fixed_text.h" #include "sherlock/tattoo/tattoo_people.h" #include "sherlock/tattoo/tattoo_scene.h" #include "sherlock/tattoo/tattoo_talk.h" +#include "sherlock/tattoo/tattoo_user_interface.h" namespace Sherlock { @@ -306,8 +308,14 @@ void Talk::talkTo(const Common::String filename) { if (_scriptMoreFlag && _scriptSelect != 100) select = _scriptSelect; - if (select == -1) + if (select == -1) { + if (IS_ROSE_TATTOO) { + static_cast<Tattoo::TattooUserInterface *>(&ui)->putMessage( + "%s", _vm->_fixedText->getText(Tattoo::kFixedText_NoEffect)); + return; + } error("Couldn't find statement to display"); + } // Add the statement into the journal and talk history if (_talkTo != -1 && !_talkHistory[_converseNum][select]) diff --git a/engines/sherlock/tattoo/tattoo_journal.cpp b/engines/sherlock/tattoo/tattoo_journal.cpp index 918887f320..8e1a61d36e 100644 --- a/engines/sherlock/tattoo/tattoo_journal.cpp +++ b/engines/sherlock/tattoo/tattoo_journal.cpp @@ -523,15 +523,15 @@ void TattooJournal::drawControls(int mode) { if (mode != 2) { // Draw the Bars separating the Journal Commands - int xp = r.right / 3; + int xp = r.left + r.width() / 3; for (int idx = 0; idx < 2; ++idx) { screen._backBuffer1.SHtransBlitFrom(images[6], Common::Point(xp - 2, r.top + 1)); screen._backBuffer1.SHtransBlitFrom(images[7], Common::Point(xp - 2, yp - 1)); - screen._backBuffer1.hLine(xp - 1, r.top + 4, yp - 2, INFO_TOP); - screen._backBuffer1.hLine(xp, r.top + 4, yp - 2, INFO_MIDDLE); - screen._backBuffer1.hLine(xp + 1, r.top + 4, yp - 2, INFO_BOTTOM); - xp = r.right / 3 * 2; + screen._backBuffer1.vLine(xp - 1, r.top + 4, yp - 2, INFO_TOP); + screen._backBuffer1.vLine(xp, r.top + 4, yp - 2, INFO_MIDDLE); + screen._backBuffer1.vLine(xp + 1, r.top + 4, yp - 2, INFO_BOTTOM); + xp += r.width() / 3; } } diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp index dfdd765120..07be1c672f 100644 --- a/engines/sky/control.cpp +++ b/engines/sky/control.cpp @@ -1562,8 +1562,13 @@ void Control::showGameQuitMsg() { screenData = _skyScreen->giveCurrent(); - _skyText->displayText(_quitTexts[SkyEngine::_systemVars.language * 2 + 0], textBuf1, true, 320, 255); - _skyText->displayText(_quitTexts[SkyEngine::_systemVars.language * 2 + 1], textBuf2, true, 320, 255); + if (Common::parseLanguage(ConfMan.get("language")) == Common::RU_RUS) { + _skyText->displayText(_quitTexts[8 * 2 + 0], textBuf1, true, 320, 255); + _skyText->displayText(_quitTexts[8 * 2 + 1], textBuf2, true, 320, 255); + } else { + _skyText->displayText(_quitTexts[SkyEngine::_systemVars.language * 2 + 0], textBuf1, true, 320, 255); + _skyText->displayText(_quitTexts[SkyEngine::_systemVars.language * 2 + 1], textBuf2, true, 320, 255); + } uint8 *curLine1 = textBuf1 + sizeof(DataFileHeader); uint8 *curLine2 = textBuf2 + sizeof(DataFileHeader); uint8 *targetLine = screenData + GAME_SCREEN_WIDTH * 80; @@ -1584,7 +1589,7 @@ void Control::showGameQuitMsg() { free(textBuf2); } -char Control::_quitTexts[16][35] = { +char Control::_quitTexts[18][35] = { "Game over player one", "BE VIGILANT", "Das Spiel ist aus.", @@ -1600,7 +1605,9 @@ char Control::_quitTexts[16][35] = { "Fim de jogo para o jogador um", "BE VIGILANT", "Game over player one", - "BE VIGILANT" + "BE VIGILANT", + "Irpa okohseha, irpok 1", + "JYD\x96 JDITELEH" }; uint8 Control::_crossImg[594] = { diff --git a/engines/sky/control.h b/engines/sky/control.h index 44591f299d..2089c74363 100644 --- a/engines/sky/control.h +++ b/engines/sky/control.h @@ -292,7 +292,7 @@ private: ControlStatus *_statusBar; - static char _quitTexts[16][35]; + static char _quitTexts[18][35]; static uint8 _crossImg[594]; }; diff --git a/engines/sky/music/adlibchannel.cpp b/engines/sky/music/adlibchannel.cpp index c7acb9b6c1..2f44add466 100644 --- a/engines/sky/music/adlibchannel.cpp +++ b/engines/sky/music/adlibchannel.cpp @@ -23,7 +23,7 @@ #include "common/endian.h" #include "common/textconsole.h" -#include "common/util.h" +#include "audio/fmopl.h" #include "sky/music/adlibchannel.h" #include "sky/sky.h" diff --git a/engines/sky/music/adlibchannel.h b/engines/sky/music/adlibchannel.h index 4504e3b570..b190ba27dc 100644 --- a/engines/sky/music/adlibchannel.h +++ b/engines/sky/music/adlibchannel.h @@ -24,7 +24,10 @@ #define SKY_MUSIC_ADLIBCHANNEL_H #include "sky/music/musicbase.h" -#include "audio/fmopl.h" + +namespace OPL { +class OPL; +} namespace Sky { diff --git a/engines/sky/music/adlibmusic.cpp b/engines/sky/music/adlibmusic.cpp index be5e7b2353..1a2a91c82a 100644 --- a/engines/sky/music/adlibmusic.cpp +++ b/engines/sky/music/adlibmusic.cpp @@ -26,9 +26,13 @@ #include "sky/music/adlibmusic.h" #include "sky/music/adlibchannel.h" -#include "audio/mixer.h" +#include "audio/fmopl.h" #include "sky/sky.h" +namespace Audio { +class Mixer; +} + namespace Sky { AdLibMusic::AdLibMusic(Audio::Mixer *pMixer, Disk *pDisk) : MusicBase(pMixer, pDisk) { diff --git a/engines/sky/music/adlibmusic.h b/engines/sky/music/adlibmusic.h index 7b51f2d3a0..ebfa038848 100644 --- a/engines/sky/music/adlibmusic.h +++ b/engines/sky/music/adlibmusic.h @@ -24,7 +24,10 @@ #define SKY_MUSIC_ADLIBMUSIC_H #include "sky/music/musicbase.h" -#include "audio/audiostream.h" + +namespace Audio { +class Mixer; +} namespace OPL { class OPL; diff --git a/engines/sky/skydefs.h b/engines/sky/skydefs.h index 167b7dade2..ed07a5e2cd 100644 --- a/engines/sky/skydefs.h +++ b/engines/sky/skydefs.h @@ -45,6 +45,7 @@ namespace Sky { #define SKY_ITALIAN 5 #define SKY_PORTUGUESE 6 #define SKY_SPANISH 7 +#define SKY_RUSSIAN 8 #define ST_COLLISION_BIT 5 diff --git a/engines/sword1/logic.h b/engines/sword1/logic.h index 94da2b3a77..005846df16 100644 --- a/engines/sword1/logic.h +++ b/engines/sword1/logic.h @@ -28,10 +28,13 @@ #include "sword1/objectman.h" #include "common/util.h" #include "common/random.h" -#include "audio/mixer.h" class OSystem; +namespace Audio { +class Mixer; +} + namespace Sword1 { #define NON_ZERO_SCRIPT_VARS 95 diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index 4deaf06edc..a37f7d250d 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -37,7 +37,6 @@ #include "audio/decoders/mp3.h" #include "audio/decoders/raw.h" #include "audio/decoders/vorbis.h" -#include "audio/decoders/wave.h" #include "audio/decoders/xa.h" namespace Sword1 { diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp index 1e9b7f70f4..1556f080e9 100644 --- a/engines/sword1/sword1.cpp +++ b/engines/sword1/sword1.cpp @@ -39,7 +39,6 @@ #include "engines/util.h" #include "gui/message.h" -#include "gui/gui-manager.h" namespace Sword1 { diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp index 62fb3d244d..462a49055d 100644 --- a/engines/sword2/music.cpp +++ b/engines/sword2/music.cpp @@ -35,10 +35,11 @@ #include "common/system.h" #include "common/textconsole.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" #include "audio/decoders/mp3.h" #include "audio/decoders/vorbis.h" #include "audio/decoders/flac.h" -#include "audio/decoders/wave.h" #include "audio/decoders/xa.h" #include "audio/rate.h" diff --git a/engines/sword25/sfx/soundengine.cpp b/engines/sword25/sfx/soundengine.cpp index dcb29cb380..46f27b06f0 100644 --- a/engines/sword25/sfx/soundengine.cpp +++ b/engines/sword25/sfx/soundengine.cpp @@ -36,6 +36,7 @@ #include "sword25/kernel/inputpersistenceblock.h" #include "sword25/kernel/outputpersistenceblock.h" +#include "audio/audiostream.h" #include "audio/decoders/vorbis.h" #include "common/system.h" diff --git a/engines/sword25/sfx/soundengine.h b/engines/sword25/sfx/soundengine.h index 1dd7ba0925..9bf251be15 100644 --- a/engines/sword25/sfx/soundengine.h +++ b/engines/sword25/sfx/soundengine.h @@ -49,7 +49,6 @@ #include "sword25/kernel/resservice.h" #include "sword25/kernel/persistable.h" -#include "audio/audiostream.h" #include "audio/mixer.h" namespace Sword25 { diff --git a/engines/teenagent/font.cpp b/engines/teenagent/font.cpp index ab75a45ba7..f691ace32d 100644 --- a/engines/teenagent/font.cpp +++ b/engines/teenagent/font.cpp @@ -25,6 +25,7 @@ #include "teenagent/pack.h" #include "teenagent/teenagent.h" +#include "common/debug.h" #include "common/endian.h" #include "common/stream.h" #include "common/textconsole.h" diff --git a/engines/teenagent/resources.cpp b/engines/teenagent/resources.cpp index 8d8f705a24..3cf566a0e5 100644 --- a/engines/teenagent/resources.cpp +++ b/engines/teenagent/resources.cpp @@ -22,6 +22,7 @@ #include "teenagent/resources.h" #include "teenagent/teenagent.h" +#include "common/debug.h" #include "common/textconsole.h" #include "common/translation.h" #include "common/zlib.h" diff --git a/engines/teenagent/teenagent.h b/engines/teenagent/teenagent.h index a06f8dbf9b..234bfb1c57 100644 --- a/engines/teenagent/teenagent.h +++ b/engines/teenagent/teenagent.h @@ -25,11 +25,9 @@ #include "engines/engine.h" -#include "audio/audiostream.h" #include "audio/mixer.h" #include "common/random.h" -#include "common/rect.h" #include "common/array.h" #include "gui/debugger.h" @@ -39,6 +37,14 @@ struct ADGameDescription; +namespace Audio { +class AudioStream; +} + +namespace Common { +struct Point; +} + /** * This is the namespace of the TeenAgent engine. * @@ -53,7 +59,6 @@ struct Object; struct UseHotspot; class Scene; class MusicPlayer; -class Dialog; class Resources; class Inventory; diff --git a/engines/testbed/config.h b/engines/testbed/config.h index db687de261..738f07ab87 100644 --- a/engines/testbed/config.h +++ b/engines/testbed/config.h @@ -30,7 +30,7 @@ #include "common/tokenizer.h" #include "gui/widgets/list.h" -#include "gui/options.h" +#include "gui/dialog.h" #include "gui/ThemeEngine.h" #include "testbed/testsuite.h" diff --git a/engines/testbed/midi.cpp b/engines/testbed/midi.cpp index daa5f1cf3c..5ede21f4ab 100644 --- a/engines/testbed/midi.cpp +++ b/engines/testbed/midi.cpp @@ -27,6 +27,7 @@ #include "graphics/cursorman.h" #include "audio/mididrv.h" +#include "audio/midiparser.h" #include "testbed/midi.h" #include "testbed/testbed.h" diff --git a/engines/testbed/midi.h b/engines/testbed/midi.h index b9f3e82abd..5ed0a73913 100644 --- a/engines/testbed/midi.h +++ b/engines/testbed/midi.h @@ -23,12 +23,16 @@ #ifndef TESTBED_MIDI_H #define TESTBED_MIDI_H -#include "common/stream.h" -#include "audio/midiparser.h" #include "testbed/testsuite.h" // This file can be used as template for header files of other newer testsuites. +class MidiParser; + +namespace Common { +class WriteStream; +} + namespace Testbed { namespace MidiTests { diff --git a/engines/testbed/sound.h b/engines/testbed/sound.h index 893a89b175..5de8877284 100644 --- a/engines/testbed/sound.h +++ b/engines/testbed/sound.h @@ -23,7 +23,6 @@ #ifndef TESTBED_SOUND_H #define TESTBED_SOUND_H -#include "gui/dialog.h" #include "audio/mixer.h" #include "testbed/config.h" #include "testbed/testsuite.h" diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp index f28cd684f9..22c3798fc6 100644 --- a/engines/tinsel/bmv.cpp +++ b/engines/tinsel/bmv.cpp @@ -39,6 +39,7 @@ #include "tinsel/tinlib.h" #include "tinsel/tinsel.h" +#include "audio/audiostream.h" #include "audio/decoders/raw.h" #include "common/textconsole.h" diff --git a/engines/tinsel/bmv.h b/engines/tinsel/bmv.h index e52297f9de..888f910627 100644 --- a/engines/tinsel/bmv.h +++ b/engines/tinsel/bmv.h @@ -27,12 +27,15 @@ #include "common/coroutines.h" #include "common/file.h" -#include "audio/audiostream.h" #include "audio/mixer.h" #include "tinsel/object.h" #include "tinsel/palette.h" +namespace Audio { +class QueuingAudioStream; +} + namespace Tinsel { diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index e0c1f8d1f9..32d5abb865 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -29,7 +29,6 @@ #include "audio/midiparser.h" // Miles Audio for Discworld 1 #include "audio/miles.h" -#include "audio/decoders/adpcm.h" #include "backends/audiocd/audiocd.h" diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp index 3d87a17331..a13e91fb3c 100644 --- a/engines/tinsel/sound.cpp +++ b/engines/tinsel/sound.cpp @@ -27,7 +27,6 @@ #include "tinsel/dw.h" #include "tinsel/config.h" #include "tinsel/music.h" -#include "tinsel/strres.h" #include "tinsel/tinsel.h" #include "tinsel/sysvar.h" #include "tinsel/background.h" @@ -37,7 +36,6 @@ #include "common/system.h" #include "audio/mixer.h" -#include "audio/decoders/adpcm.h" #include "audio/decoders/flac.h" #include "audio/decoders/mp3.h" #include "audio/decoders/raw.h" diff --git a/engines/toltecs/movie.cpp b/engines/toltecs/movie.cpp index 0aa0a99a36..b64903ec6d 100644 --- a/engines/toltecs/movie.cpp +++ b/engines/toltecs/movie.cpp @@ -20,6 +20,7 @@ * */ +#include "audio/audiostream.h" #include "audio/mixer.h" #include "audio/decoders/raw.h" diff --git a/engines/toltecs/movie.h b/engines/toltecs/movie.h index 9404e5f639..8c6348d700 100644 --- a/engines/toltecs/movie.h +++ b/engines/toltecs/movie.h @@ -23,9 +23,12 @@ #ifndef TOLTECS_MOVIE_H #define TOLTECS_MOVIE_H -#include "audio/audiostream.h" #include "audio/mixer.h" // for Audio::SoundHandle +namespace Audio { +class QueuingAudioStream; +} + namespace Toltecs { class MoviePlayer { diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp index 3ab23a1e51..169e2eff7b 100644 --- a/engines/toon/toon.cpp +++ b/engines/toon/toon.cpp @@ -35,7 +35,6 @@ #include "graphics/surface.h" #include "graphics/thumbnail.h" #include "gui/saveload.h" -#include "gui/about.h" #include "gui/message.h" #include "toon/resource.h" #include "toon/toon.h" diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp index ff4f41f44d..bb21f399c6 100644 --- a/engines/touche/touche.cpp +++ b/engines/touche/touche.cpp @@ -32,6 +32,7 @@ #include "common/keyboard.h" #include "common/textconsole.h" +#include "audio/audiostream.h" #include "audio/mixer.h" #include "engines/util.h" diff --git a/engines/touche/touche.h b/engines/touche/touche.h index 3de5b8caf2..33c415d9dc 100644 --- a/engines/touche/touche.h +++ b/engines/touche/touche.h @@ -31,7 +31,6 @@ #include "common/util.h" #include "audio/mixer.h" -#include "audio/audiostream.h" #include "engines/engine.h" diff --git a/engines/tsage/blue_force/blueforce_dialogs.cpp b/engines/tsage/blue_force/blueforce_dialogs.cpp index 3697ca700e..99db61b64d 100644 --- a/engines/tsage/blue_force/blueforce_dialogs.cpp +++ b/engines/tsage/blue_force/blueforce_dialogs.cpp @@ -20,9 +20,6 @@ * */ -#include "gui/dialog.h" -#include "gui/widget.h" - #include "tsage/tsage.h" #include "tsage/core.h" #include "tsage/dialogs.h" diff --git a/engines/tsage/blue_force/blueforce_dialogs.h b/engines/tsage/blue_force/blueforce_dialogs.h index 77017db9d0..38ec7a7828 100644 --- a/engines/tsage/blue_force/blueforce_dialogs.h +++ b/engines/tsage/blue_force/blueforce_dialogs.h @@ -23,13 +23,10 @@ #ifndef TSAGE_BLUEFORCE_DIALOGS_H #define TSAGE_BLUEFORCE_DIALOGS_H -#include "gui/options.h" +#include "tsage/core.h" #include "tsage/dialogs.h" #include "tsage/events.h" #include "tsage/graphics.h" -#include "common/list.h" -#include "common/rect.h" -#include "common/system.h" namespace TsAGE { diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp index 1cbebd140e..6c37d18cc7 100644 --- a/engines/tsage/blue_force/blueforce_scenes1.cpp +++ b/engines/tsage/blue_force/blueforce_scenes1.cpp @@ -22,6 +22,7 @@ #include "common/config-manager.h" #include "tsage/blue_force/blueforce_scenes1.h" +#include "tsage/dialogs.h" #include "tsage/scenes.h" #include "tsage/tsage.h" #include "tsage/staticres.h" diff --git a/engines/tsage/blue_force/blueforce_scenes4.cpp b/engines/tsage/blue_force/blueforce_scenes4.cpp index 50f8499b3b..7c5b41092c 100644 --- a/engines/tsage/blue_force/blueforce_scenes4.cpp +++ b/engines/tsage/blue_force/blueforce_scenes4.cpp @@ -21,7 +21,6 @@ */ #include "tsage/blue_force/blueforce_scenes4.h" -#include "tsage/blue_force/blueforce_dialogs.h" #include "tsage/scenes.h" #include "tsage/tsage.h" #include "tsage/staticres.h" diff --git a/engines/tsage/blue_force/blueforce_scenes5.cpp b/engines/tsage/blue_force/blueforce_scenes5.cpp index 562facd000..b757860dda 100644 --- a/engines/tsage/blue_force/blueforce_scenes5.cpp +++ b/engines/tsage/blue_force/blueforce_scenes5.cpp @@ -21,7 +21,6 @@ */ #include "tsage/blue_force/blueforce_scenes5.h" -#include "tsage/blue_force/blueforce_dialogs.h" #include "tsage/scenes.h" #include "tsage/tsage.h" #include "tsage/staticres.h" diff --git a/engines/tsage/blue_force/blueforce_scenes6.cpp b/engines/tsage/blue_force/blueforce_scenes6.cpp index 0d6b5c2487..921b2c89d0 100644 --- a/engines/tsage/blue_force/blueforce_scenes6.cpp +++ b/engines/tsage/blue_force/blueforce_scenes6.cpp @@ -21,7 +21,6 @@ */ #include "tsage/blue_force/blueforce_scenes6.h" -#include "tsage/blue_force/blueforce_dialogs.h" #include "tsage/scenes.h" #include "tsage/tsage.h" #include "tsage/staticres.h" diff --git a/engines/tsage/blue_force/blueforce_scenes8.cpp b/engines/tsage/blue_force/blueforce_scenes8.cpp index 337e73dad0..15767215c5 100644 --- a/engines/tsage/blue_force/blueforce_scenes8.cpp +++ b/engines/tsage/blue_force/blueforce_scenes8.cpp @@ -21,7 +21,6 @@ */ #include "tsage/blue_force/blueforce_scenes8.h" -#include "tsage/blue_force/blueforce_dialogs.h" #include "tsage/scenes.h" #include "tsage/tsage.h" #include "tsage/staticres.h" diff --git a/engines/tsage/dialogs.cpp b/engines/tsage/dialogs.cpp index dd4bc6aa86..3704ce1f04 100644 --- a/engines/tsage/dialogs.cpp +++ b/engines/tsage/dialogs.cpp @@ -23,6 +23,7 @@ #include "common/translation.h" #include "gui/dialog.h" +#include "gui/options.h" #include "gui/widget.h" #include "tsage/tsage.h" @@ -91,6 +92,11 @@ int MessageDialog::show2(const Common::String &message, const Common::String &bt /*--------------------------------------------------------------------------*/ +class ConfigDialog : public GUI::OptionsDialog { +public: + ConfigDialog(); +}; + ConfigDialog::ConfigDialog() : GUI::OptionsDialog("", "GlobalConfig") { // // Sound controllers diff --git a/engines/tsage/dialogs.h b/engines/tsage/dialogs.h index 8ab37f6c93..33a5fa47a4 100644 --- a/engines/tsage/dialogs.h +++ b/engines/tsage/dialogs.h @@ -23,7 +23,6 @@ #ifndef TSAGE_DIALOGS_H #define TSAGE_DIALOGS_H -#include "gui/options.h" #include "tsage/events.h" #include "tsage/graphics.h" #include "common/list.h" @@ -44,11 +43,6 @@ public: static int show2(const Common::String &message, const Common::String &btn1Message, const Common::String &btn2Message = Common::String()); }; -class ConfigDialog : public GUI::OptionsDialog { -public: - ConfigDialog(); -}; - /*--------------------------------------------------------------------------*/ class ModalDialog : public GfxDialog { diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index e1ebe261dc..8a441db922 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -25,7 +25,6 @@ #include "common/random.h" #include "tsage/core.h" -#include "tsage/dialogs.h" #include "tsage/scenes.h" #include "tsage/events.h" #include "tsage/sound.h" diff --git a/engines/tsage/ringworld/ringworld_demo.cpp b/engines/tsage/ringworld/ringworld_demo.cpp index cd2ab07a50..9aab0c4d21 100644 --- a/engines/tsage/ringworld/ringworld_demo.cpp +++ b/engines/tsage/ringworld/ringworld_demo.cpp @@ -21,6 +21,7 @@ */ #include "tsage/ringworld/ringworld_demo.h" +#include "tsage/dialogs.h" #include "tsage/scenes.h" #include "tsage/tsage.h" #include "tsage/staticres.h" @@ -79,11 +80,7 @@ void RingworldDemoGame::processEvent(Event &event) { case Common::KEYCODE_F2: { // F2 - Sound Options - ConfigDialog *dlg = new ConfigDialog(); - dlg->runModal(); - delete dlg; - g_globals->_soundManager.syncSounds(); - g_globals->_events.setCursorFromFlag(); + SoundDialog::execute(); break; } diff --git a/engines/tsage/ringworld/ringworld_dialogs.cpp b/engines/tsage/ringworld/ringworld_dialogs.cpp index 9fa17f3920..bc357cac25 100644 --- a/engines/tsage/ringworld/ringworld_dialogs.cpp +++ b/engines/tsage/ringworld/ringworld_dialogs.cpp @@ -20,9 +20,6 @@ * */ -#include "gui/dialog.h" -#include "gui/widget.h" - #include "tsage/tsage.h" #include "tsage/core.h" #include "tsage/dialogs.h" diff --git a/engines/tsage/ringworld/ringworld_dialogs.h b/engines/tsage/ringworld/ringworld_dialogs.h index 68ac0a05f9..4753968bf3 100644 --- a/engines/tsage/ringworld/ringworld_dialogs.h +++ b/engines/tsage/ringworld/ringworld_dialogs.h @@ -23,7 +23,7 @@ #ifndef TSAGE_RINGWORLD_DIALOGS_H #define TSAGE_RINGWORLD_DIALOGS_H -#include "gui/options.h" +#include "tsage/dialogs.h" #include "tsage/events.h" #include "tsage/graphics.h" #include "common/list.h" diff --git a/engines/tsage/ringworld/ringworld_scenes2.cpp b/engines/tsage/ringworld/ringworld_scenes2.cpp index 1140f6f3d1..6811d3c3e8 100644 --- a/engines/tsage/ringworld/ringworld_scenes2.cpp +++ b/engines/tsage/ringworld/ringworld_scenes2.cpp @@ -22,6 +22,7 @@ #include "common/config-manager.h" #include "tsage/ringworld/ringworld_scenes2.h" +#include "tsage/dialogs.h" #include "tsage/scenes.h" #include "tsage/tsage.h" #include "tsage/staticres.h" diff --git a/engines/tsage/ringworld2/ringworld2_dialogs.cpp b/engines/tsage/ringworld2/ringworld2_dialogs.cpp index 027fb558db..5cd124f91d 100644 --- a/engines/tsage/ringworld2/ringworld2_dialogs.cpp +++ b/engines/tsage/ringworld2/ringworld2_dialogs.cpp @@ -22,9 +22,6 @@ #include "common/translation.h" -#include "gui/dialog.h" -#include "gui/widget.h" - #include "tsage/tsage.h" #include "tsage/core.h" #include "tsage/dialogs.h" diff --git a/engines/tsage/ringworld2/ringworld2_dialogs.h b/engines/tsage/ringworld2/ringworld2_dialogs.h index 3d1e1ad48c..71e0c23f35 100644 --- a/engines/tsage/ringworld2/ringworld2_dialogs.h +++ b/engines/tsage/ringworld2/ringworld2_dialogs.h @@ -23,7 +23,7 @@ #ifndef TSAGE_RINGWORLD2_DIALOGS_H #define TSAGE_RINGWORLD2_DIALOGS_H -#include "gui/options.h" +#include "tsage/core.h" #include "tsage/dialogs.h" #include "tsage/events.h" #include "tsage/graphics.h" diff --git a/engines/tsage/ringworld2/ringworld2_outpost.cpp b/engines/tsage/ringworld2/ringworld2_outpost.cpp index 8c64970bda..d0d67031ec 100644 --- a/engines/tsage/ringworld2/ringworld2_outpost.cpp +++ b/engines/tsage/ringworld2/ringworld2_outpost.cpp @@ -21,6 +21,7 @@ */ #include "graphics/cursorman.h" +#include "tsage/dialogs.h" #include "tsage/tsage.h" #include "tsage/staticres.h" #include "tsage/ringworld2/ringworld2_outpost.h" diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp index 81dc05e2a4..70937fcbc4 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp @@ -23,6 +23,7 @@ #include "graphics/cursorman.h" #include "tsage/scenes.h" +#include "tsage/dialogs.h" #include "tsage/tsage.h" #include "tsage/staticres.h" #include "tsage/ringworld2/ringworld2_scenes1.h" diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp index 095c0d7ab5..6f2f953aee 100644 --- a/engines/tsage/scenes.cpp +++ b/engines/tsage/scenes.cpp @@ -23,6 +23,7 @@ #include "common/config-manager.h" #include "common/translation.h" #include "gui/saveload.h" +#include "tsage/dialogs.h" #include "tsage/scenes.h" #include "tsage/globals.h" #include "tsage/ringworld/ringworld_logic.h" diff --git a/engines/tsage/sound.h b/engines/tsage/sound.h index 68755a48c8..da56c8bfa5 100644 --- a/engines/tsage/sound.h +++ b/engines/tsage/sound.h @@ -26,12 +26,15 @@ #include "common/scummsys.h" #include "common/mutex.h" #include "common/queue.h" -#include "audio/audiostream.h" #include "audio/mixer.h" #include "common/list.h" #include "tsage/saveload.h" #include "tsage/core.h" +namespace Audio { +class QueuingAudioStream; +} + namespace OPL { class OPL; } diff --git a/engines/tsage/tsage.h b/engines/tsage/tsage.h index 1a29700a10..dd077e526f 100644 --- a/engines/tsage/tsage.h +++ b/engines/tsage/tsage.h @@ -24,9 +24,6 @@ #define TSAGE_H #include "engines/engine.h" -#include "common/rect.h" -#include "audio/mixer.h" -#include "common/file.h" #include "gui/debugger.h" #include "tsage/core.h" diff --git a/engines/voyeur/animation.h b/engines/voyeur/animation.h index bc6d8a361a..c20ccf7284 100644 --- a/engines/voyeur/animation.h +++ b/engines/voyeur/animation.h @@ -26,13 +26,16 @@ #include "video/video_decoder.h" #include "audio/audiostream.h" #include "audio/mixer.h" -#include "audio/timestamp.h" #include "common/array.h" #include "common/list.h" #include "common/rect.h" #include "common/stream.h" #include "voyeur/files.h" +namespace Audio { +class Timestamp; +} + namespace Voyeur { class VoyeurEngine; diff --git a/engines/voyeur/sound.cpp b/engines/voyeur/sound.cpp index f47fdde3e1..483dfc7cbc 100644 --- a/engines/voyeur/sound.cpp +++ b/engines/voyeur/sound.cpp @@ -22,6 +22,8 @@ #include "audio/audiostream.h" #include "audio/decoders/raw.h" +#include "audio/decoders/voc.h" +#include "common/file.h" #include "common/memstream.h" #include "voyeur/sound.h" #include "voyeur/staticres.h" diff --git a/engines/voyeur/sound.h b/engines/voyeur/sound.h index af1d0b1b46..fd1d126ef0 100644 --- a/engines/voyeur/sound.h +++ b/engines/voyeur/sound.h @@ -26,8 +26,6 @@ #include "common/scummsys.h" #include "common/str.h" #include "audio/mixer.h" -#include "audio/decoders/voc.h" -#include "voyeur/files.h" namespace Voyeur { diff --git a/engines/wage/design.cpp b/engines/wage/design.cpp index 907a1ec435..e84cf2e89e 100644 --- a/engines/wage/design.cpp +++ b/engines/wage/design.cpp @@ -52,13 +52,13 @@ namespace Wage { struct PlotData { - Graphics::Surface *surface; + Graphics::ManagedSurface *surface; Patterns *patterns; uint fillType; int thickness; Design *design; - PlotData(Graphics::Surface *s, Patterns *p, int f, int t, Design *d) : + PlotData(Graphics::ManagedSurface *s, Patterns *p, int f, int t, Design *d) : surface(s), patterns(p), fillType(f), thickness(t), design(d) {} }; @@ -83,7 +83,7 @@ Design::~Design() { delete _surface; } -void Design::paint(Graphics::Surface *surface, Patterns &patterns, int x, int y) { +void Design::paint(Graphics::ManagedSurface *surface, Patterns &patterns, int x, int y) { bool needRender = false; if (_surface == NULL) { @@ -96,11 +96,10 @@ void Design::paint(Graphics::Surface *surface, Patterns &patterns, int x, int y) } _bounds->debugPrint(4, "Calculated bounds:"); - _surface = new Graphics::Surface; + _surface = new Graphics::ManagedSurface; _surface->create(_bounds->width(), _bounds->height(), Graphics::PixelFormat::createFormatCLUT8()); - Common::Rect r(0, 0, _bounds->width(), _bounds->height()); - _surface->fillRect(r, kColorGreen); + _surface->clear(kColorGreen); needRender = true; } @@ -133,16 +132,10 @@ void Design::paint(Graphics::Surface *surface, Patterns &patterns, int x, int y) if (_bounds->width() && _bounds->height()) { const int padding = 3; - for (int i = padding; i < _bounds->height() - 2 * padding; i++) { - const byte *src = (const byte *)_surface->getBasePtr(padding, i); - byte *dst = (byte *)surface->getBasePtr(x + padding, y+i); - for (int j = padding; j < _bounds->width() - 2 * padding; j++) { - if (*src != kColorGreen) - *dst = *src; - src++; - dst++; - } - } + Common::Rect from(padding, padding, _bounds->width() - 2 * padding, _bounds->height() - 2 * padding); + Common::Rect to(from); + to.moveTo(x, y); + surface->transBlitFrom(*_surface, from, to, kColorGreen); } } @@ -215,9 +208,9 @@ void drawPixel(int x, int y, int color, void *data) { if (p->thickness == 1) { p->design->adjustBounds(x, y); } else { - int x1 = x - p->thickness / 2; + int x1 = x; int x2 = x1 + p->thickness; - int y1 = y - p->thickness / 2; + int y1 = y; int y2 = y1 + p->thickness; for (y = y1; y < y2; y++) @@ -240,9 +233,9 @@ void drawPixel(int x, int y, int color, void *data) { color : kColorWhite; } } else { - int x1 = x - p->thickness / 2; + int x1 = x; int x2 = x1 + p->thickness; - int y1 = y - p->thickness / 2; + int y1 = y; int y2 = y1 + p->thickness; for (y = y1; y < y2; y++) @@ -269,7 +262,7 @@ void drawPixelPlain(int x, int y, int color, void *data) { *((byte *)p->surface->getBasePtr(x, y)) = (byte)color; } -void Design::drawRect(Graphics::Surface *surface, Common::ReadStream &in, +void Design::drawRect(Graphics::ManagedSurface *surface, Common::ReadStream &in, Patterns &patterns, byte fillType, byte borderThickness, byte borderFillType) { int16 y1 = in.readSint16BE(); int16 x1 = in.readSint16BE(); @@ -298,7 +291,7 @@ void Design::drawRect(Graphics::Surface *surface, Common::ReadStream &in, } } -void Design::drawRoundRect(Graphics::Surface *surface, Common::ReadStream &in, +void Design::drawRoundRect(Graphics::ManagedSurface *surface, Common::ReadStream &in, Patterns &patterns, byte fillType, byte borderThickness, byte borderFillType) { int16 y1 = in.readSint16BE(); int16 x1 = in.readSint16BE(); @@ -324,7 +317,7 @@ void Design::drawRoundRect(Graphics::Surface *surface, Common::ReadStream &in, Graphics::drawRoundRect(r, arc / 2, kColorBlack, false, drawPixel, &pd); } -void Design::drawPolygon(Graphics::Surface *surface, Common::ReadStream &in, +void Design::drawPolygon(Graphics::ManagedSurface *surface, Common::ReadStream &in, Patterns &patterns, byte fillType, byte borderThickness, byte borderFillType) { byte ignored = in.readSint16BE(); // ignored @@ -401,7 +394,7 @@ void Design::drawPolygon(Graphics::Surface *surface, Common::ReadStream &in, free(ypoints); } -void Design::drawOval(Graphics::Surface *surface, Common::ReadStream &in, +void Design::drawOval(Graphics::ManagedSurface *surface, Common::ReadStream &in, Patterns &patterns, byte fillType, byte borderThickness, byte borderFillType) { int16 y1 = in.readSint16BE(); int16 x1 = in.readSint16BE(); @@ -419,7 +412,7 @@ void Design::drawOval(Graphics::Surface *surface, Common::ReadStream &in, Graphics::drawEllipse(x1, y1, x2-1, y2-1, kColorBlack, false, drawPixel, &pd); } -void Design::drawBitmap(Graphics::Surface *surface, Common::SeekableReadStream &in) { +void Design::drawBitmap(Graphics::ManagedSurface *surface, Common::SeekableReadStream &in) { int numBytes = in.readSint16BE(); int y1 = in.readSint16BE(); int x1 = in.readSint16BE(); @@ -427,7 +420,7 @@ void Design::drawBitmap(Graphics::Surface *surface, Common::SeekableReadStream & int x2 = in.readSint16BE(); int w = x2 - x1; int h = y2 - y1; - Graphics::Surface tmp; + Graphics::ManagedSurface tmp; tmp.create(w, h, Graphics::PixelFormat::createFormatCLUT8()); @@ -507,11 +500,11 @@ void Design::drawBitmap(Graphics::Surface *surface, Common::SeekableReadStream & tmp.free(); } -void Design::drawRect(Graphics::Surface *surface, Common::Rect &rect, int thickness, int color, Patterns &patterns, byte fillType) { +void Design::drawRect(Graphics::ManagedSurface *surface, Common::Rect &rect, int thickness, int color, Patterns &patterns, byte fillType) { drawRect(surface, rect.left, rect.top, rect.right, rect.bottom, thickness, color, patterns, fillType); } -void Design::drawRect(Graphics::Surface *surface, int x1, int y1, int x2, int y2, int thickness, int color, Patterns &patterns, byte fillType) { +void Design::drawRect(Graphics::ManagedSurface *surface, int x1, int y1, int x2, int y2, int thickness, int color, Patterns &patterns, byte fillType) { PlotData pd(surface, &patterns, fillType, thickness, nullptr); Graphics::drawLine(x1, y1, x2, y1, kColorBlack, drawPixel, &pd); @@ -521,32 +514,32 @@ void Design::drawRect(Graphics::Surface *surface, int x1, int y1, int x2, int y2 } -void Design::drawFilledRect(Graphics::Surface *surface, Common::Rect &rect, int color, Patterns &patterns, byte fillType) { +void Design::drawFilledRect(Graphics::ManagedSurface *surface, Common::Rect &rect, int color, Patterns &patterns, byte fillType) { PlotData pd(surface, &patterns, fillType, 1, nullptr); for (int y = rect.top; y <= rect.bottom; y++) Graphics::drawHLine(rect.left, rect.right, y, color, drawPixel, &pd); } -void Design::drawFilledRoundRect(Graphics::Surface *surface, Common::Rect &rect, int arc, int color, Patterns &patterns, byte fillType) { +void Design::drawFilledRoundRect(Graphics::ManagedSurface *surface, Common::Rect &rect, int arc, int color, Patterns &patterns, byte fillType) { PlotData pd(surface, &patterns, fillType, 1, nullptr); Graphics::drawRoundRect(rect, arc, color, true, drawPixel, &pd); } -void Design::drawHLine(Graphics::Surface *surface, int x1, int x2, int y, int thickness, int color, Patterns &patterns, byte fillType) { +void Design::drawHLine(Graphics::ManagedSurface *surface, int x1, int x2, int y, int thickness, int color, Patterns &patterns, byte fillType) { PlotData pd(surface, &patterns, fillType, thickness, nullptr); Graphics::drawHLine(x1, x2, y, color, drawPixel, &pd); } -void Design::drawVLine(Graphics::Surface *surface, int x, int y1, int y2, int thickness, int color, Patterns &patterns, byte fillType) { +void Design::drawVLine(Graphics::ManagedSurface *surface, int x, int y1, int y2, int thickness, int color, Patterns &patterns, byte fillType) { PlotData pd(surface, &patterns, fillType, thickness, nullptr); Graphics::drawVLine(x, y1, y2, color, drawPixel, &pd); } -FloodFill::FloodFill(Graphics::Surface *surface, byte color1, byte color2) { +FloodFill::FloodFill(Graphics::ManagedSurface *surface, byte color1, byte color2) { _surface = surface; _color1 = color1; _color2 = color2; diff --git a/engines/wage/design.h b/engines/wage/design.h index e8f42f4e04..a6e0df4c40 100644 --- a/engines/wage/design.h +++ b/engines/wage/design.h @@ -48,7 +48,7 @@ #ifndef WAGE_DESIGN_H #define WAGE_DESIGN_H -#include "graphics/surface.h" +#include "graphics/managed_surface.h" #include "common/memstream.h" #include "common/rect.h" @@ -67,14 +67,14 @@ public: return _bounds; } - void paint(Graphics::Surface *canvas, Patterns &patterns, int x, int y); + void paint(Graphics::ManagedSurface *canvas, Patterns &patterns, int x, int y); bool isPointOpaque(int x, int y); - static void drawRect(Graphics::Surface *surface, Common::Rect &rect, int thickness, int color, Patterns &patterns, byte fillType); - static void drawRect(Graphics::Surface *surface, int x1, int y1, int x2, int y2, int thickness, int color, Patterns &patterns, byte fillType); - static void drawFilledRect(Graphics::Surface *surface, Common::Rect &rect, int color, Patterns &patterns, byte fillType); - static void drawFilledRoundRect(Graphics::Surface *surface, Common::Rect &rect, int arc, int color, Patterns &patterns, byte fillType); - static void drawHLine(Graphics::Surface *surface, int x1, int x2, int y, int thickness, int color, Patterns &patterns, byte fillType); - static void drawVLine(Graphics::Surface *surface, int x, int y1, int y2, int thickness, int color, Patterns &patterns, byte fillType); + static void drawRect(Graphics::ManagedSurface *surface, Common::Rect &rect, int thickness, int color, Patterns &patterns, byte fillType); + static void drawRect(Graphics::ManagedSurface *surface, int x1, int y1, int x2, int y2, int thickness, int color, Patterns &patterns, byte fillType); + static void drawFilledRect(Graphics::ManagedSurface *surface, Common::Rect &rect, int color, Patterns &patterns, byte fillType); + static void drawFilledRoundRect(Graphics::ManagedSurface *surface, Common::Rect &rect, int arc, int color, Patterns &patterns, byte fillType); + static void drawHLine(Graphics::ManagedSurface *surface, int x1, int x2, int y, int thickness, int color, Patterns &patterns, byte fillType); + static void drawVLine(Graphics::ManagedSurface *surface, int x, int y1, int y2, int thickness, int color, Patterns &patterns, byte fillType); bool isBoundsCalculation() { return _boundsCalculationMode; } void adjustBounds(int16 x, int16 y); @@ -83,32 +83,32 @@ private: byte *_data; int _len; Common::Rect *_bounds; - Graphics::Surface *_surface; + Graphics::ManagedSurface *_surface; bool _boundsCalculationMode; private: void render(Patterns &patterns); - void drawRect(Graphics::Surface *surface, Common::ReadStream &in, + void drawRect(Graphics::ManagedSurface *surface, Common::ReadStream &in, Patterns &patterns, byte fillType, byte borderThickness, byte borderFillType); - void drawRoundRect(Graphics::Surface *surface, Common::ReadStream &in, + void drawRoundRect(Graphics::ManagedSurface *surface, Common::ReadStream &in, Patterns &patterns, byte fillType, byte borderThickness, byte borderFillType); - void drawPolygon(Graphics::Surface *surface, Common::ReadStream &in, + void drawPolygon(Graphics::ManagedSurface *surface, Common::ReadStream &in, Patterns &patterns, byte fillType, byte borderThickness, byte borderFillType); - void drawOval(Graphics::Surface *surface, Common::ReadStream &in, + void drawOval(Graphics::ManagedSurface *surface, Common::ReadStream &in, Patterns &patterns, byte fillType, byte borderThickness, byte borderFillType); - void drawBitmap(Graphics::Surface *surface, Common::SeekableReadStream &in); + void drawBitmap(Graphics::ManagedSurface *surface, Common::SeekableReadStream &in); }; class FloodFill { public: - FloodFill(Graphics::Surface *surface, byte color1, byte color2); + FloodFill(Graphics::ManagedSurface *surface, byte color1, byte color2); ~FloodFill(); void addSeed(int x, int y); void fill(); private: Common::List<Common::Point *> _queue; - Graphics::Surface *_surface; + Graphics::ManagedSurface *_surface; byte _color1, _color2; byte *_visited; int _w, _h; diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h index 096338659b..59d93cc12f 100644 --- a/engines/wage/detection_tables.h +++ b/engines/wage/detection_tables.h @@ -36,13 +36,12 @@ static const ADGameDescription gameDescriptions[] = { 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? + // Crash on third screen 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", "34e7a8e84b33ba8ea38b4ffd76ef074f", 641470), FANGAME("Carbon Copy", "9e781acd63290ae390d515cffc742011", 519445), // Invalid rect in scene "FINALE" diff --git a/engines/wage/dialog.h b/engines/wage/dialog.h index c5878acc95..ec99fc06b2 100644 --- a/engines/wage/dialog.h +++ b/engines/wage/dialog.h @@ -74,7 +74,7 @@ public: private: Gui *_gui; - Graphics::Surface _tempSurface; + Graphics::ManagedSurface _tempSurface; Common::Rect _bbox; Common::String _text; diff --git a/engines/wage/entities.cpp b/engines/wage/entities.cpp index a2648c49fe..49e2592949 100644 --- a/engines/wage/entities.cpp +++ b/engines/wage/entities.cpp @@ -134,14 +134,14 @@ Scene::~Scene() { delete _textBounds; } -void Scene::paint(Graphics::Surface *surface, int x, int y) { +void Scene::paint(Graphics::ManagedSurface *surface, int x, int y) { Common::Rect r(x + 5, y + 5, _design->getBounds()->width() + x - 10, _design->getBounds()->height() + y - 10); surface->fillRect(r, kColorWhite); _design->paint(surface, ((WageEngine *)g_engine)->_world->_patterns, x, y); for (ObjList::const_iterator it = _objs.begin(); it != _objs.end(); ++it) { - debug(2, "paining Obj: %s", (*it)->_name.c_str()); + debug(2, "paining Obj: %s, index: %d, type: %d", (*it)->_name.c_str(), (*it)->_index, (*it)->_type); (*it)->_design->paint(surface, ((WageEngine *)g_engine)->_world->_patterns, x, y); } diff --git a/engines/wage/entities.h b/engines/wage/entities.h index 33cf087322..c393f15f01 100644 --- a/engines/wage/entities.h +++ b/engines/wage/entities.h @@ -49,7 +49,7 @@ #define WAGE_ENTITIES_H namespace Graphics { - struct Surface; + class ManagedSurface; } namespace Wage { @@ -326,7 +326,7 @@ public: return _textBounds == NULL ? NULL : new Common::Rect(*_textBounds); } - void paint(Graphics::Surface *screen, int x, int y); + void paint(Graphics::ManagedSurface *screen, int x, int y); const char *getFontName(); }; diff --git a/engines/wage/gui-console.cpp b/engines/wage/gui-console.cpp index ab5df637ec..840b8e3ced 100644 --- a/engines/wage/gui-console.cpp +++ b/engines/wage/gui-console.cpp @@ -142,7 +142,7 @@ void Gui::flowText(Common::String &str) { draw(); } -void Gui::renderConsole(Graphics::Surface *g, Common::Rect &r) { +void Gui::renderConsole(Graphics::ManagedSurface *g, const Common::Rect &r) { bool fullRedraw = _consoleFullRedraw; bool textReflow = false; int surfW = r.width() + kConWOverlap * 2; @@ -150,7 +150,6 @@ void Gui::renderConsole(Graphics::Surface *g, Common::Rect &r) { Common::Rect boundsR(kConWOverlap - kConOverscan, kConHOverlap - kConOverscan, r.width() + kConWOverlap + kConOverscan, r.height() + kConHOverlap + kConOverscan); - Common::Rect fullR(0, 0, surfW, surfH); if (_console.w != surfW || _console.h != surfH) { if (_console.w != surfW) @@ -163,7 +162,7 @@ void Gui::renderConsole(Graphics::Surface *g, Common::Rect &r) { } if (fullRedraw) - _console.fillRect(fullR, kColorWhite); + _console.clear(kColorWhite); const Graphics::Font *font = getConsoleFont(); @@ -280,7 +279,6 @@ void Gui::renderConsole(Graphics::Surface *g, Common::Rect &r) { rr.bottom = _screen.h - 1; g->copyRectToSurface(_console, xcon, ycon, boundsR); - g_system->copyRectToScreen(g->getBasePtr(rr.left, rr.top), g->pitch, rr.left, rr.top, rr.width(), rr.height()); } void Gui::drawInput() { diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp index 93c799e73a..436d17c56f 100644 --- a/engines/wage/gui.cpp +++ b/engines/wage/gui.cpp @@ -55,6 +55,8 @@ #include "wage/wage.h" #include "wage/design.h" #include "wage/entities.h" +#include "wage/macwindow.h" +#include "wage/macwindowmanager.h" #include "wage/menu.h" #include "wage/gui.h" #include "wage/world.h" @@ -65,7 +67,8 @@ static const byte palette[] = { 0, 0, 0, // Black 0x80, 0x80, 0x80, // Gray 0xff, 0xff, 0xff, // White - 0x00, 0xff, 0x00 // Green + 0x00, 0xff, 0x00, // Green + 0x00, 0xcf, 0x00 // Green2 }; static byte fillPatterns[][8] = { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, // kPatternSolid @@ -168,7 +171,7 @@ Gui::Gui(WageEngine *engine) { _inputTextLineNum = 0; - g_system->getPaletteManager()->setPalette(palette, 0, 4); + g_system->getPaletteManager()->setPalette(palette, 0, ARRAYSIZE(palette) / 3); CursorMan.replaceCursorPalette(palette, 0, 4); CursorMan.replaceCursor(macCursorArrow, 11, 16, 1, 1, 3); @@ -183,6 +186,9 @@ Gui::Gui(WageEngine *engine) { g_system->getTimerManager()->installTimerProc(&cursorTimerHandler, 200000, this, "wageCursor"); _menu = new Menu(this); + + _sceneWindowId = _wm.add(false); + _consoleWindowId = _wm.add(true); } Gui::~Gui() { @@ -275,13 +281,21 @@ void Gui::drawScene() { _scene = _engine->_world->_player->_currentScene; + MacWindow *w = _wm.getWindow(_sceneWindowId); + + w->setDimensions(*_scene->_designBounds); + w->setTitle(_scene->_name); + _scene->paint(w->getSurface(), 0, 0); + w->draw(&_screen); + g_system->copyRectToScreen(_screen.getBasePtr(_scene->_designBounds->left - 2, _scene->_designBounds->top - 2), + _screen.pitch, _scene->_designBounds->left - 2, _scene->_designBounds->top - 2, + _scene->_designBounds->width(), _scene->_designBounds->height()); + _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); @@ -291,27 +305,31 @@ void Gui::drawScene() { _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) + if (!_consoleDirty && !_consoleFullRedraw && !_bordersDirty && !_sceneDirty) return; - renderConsole(&_screen, _consoleTextArea); - paintBorder(&_screen, _consoleTextArea, kWindowConsole); + MacWindow *w = _wm.getWindow(_consoleWindowId); + w->setDimensions(*_scene->_textBounds); + renderConsole(w->getSurface(), Common::Rect(kBorderWidth - 2, kBorderWidth - 2, + _scene->_textBounds->width() - kBorderWidth, _scene->_textBounds->height() - kBorderWidth)); + w->draw(&_screen); + g_system->copyRectToScreen(_screen.getBasePtr(_scene->_textBounds->left - 2, _scene->_textBounds->top - 2), + _screen.pitch, _scene->_textBounds->left - 2, _scene->_textBounds->top - 2, + _scene->_textBounds->width(), _scene->_textBounds->height()); } -void Gui::drawBox(Graphics::Surface *g, int x, int y, int w, int h) { +void Gui::drawBox(Graphics::ManagedSurface *g, int x, int y, int w, int h) { Common::Rect r(x, y, x + w + 1, y + h + 1); g->fillRect(r, kColorWhite); g->frameRect(r, kColorBlack); } -void Gui::fillRect(Graphics::Surface *g, int x, int y, int w, int h, int color) { +void Gui::fillRect(Graphics::ManagedSurface *g, int x, int y, int w, int h, int color) { Common::Rect r(x, y, x + w, y + h); g->fillRect(r, color); @@ -328,7 +346,7 @@ const int arrowPixels[ARROW_H][ARROW_W] = { {1,1,1,1,1,1,1,1,1,1,1,1}}; static void drawPixelInverted(int x, int y, int color, void *data) { - Graphics::Surface *surface = (Graphics::Surface *)data; + Graphics::ManagedSurface *surface = (Graphics::ManagedSurface *)data; if (x >= 0 && x < surface->w && y >= 0 && y < surface->h) { byte *p = (byte *)surface->getBasePtr(x, y); @@ -337,7 +355,7 @@ static void drawPixelInverted(int x, int y, int color, void *data) { } } -void Gui::paintBorder(Graphics::Surface *g, Common::Rect &r, WindowType windowType, int highlightedPart, float scrollPos, float scrollSize) { +void Gui::paintBorder(Graphics::ManagedSurface *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; @@ -588,12 +606,14 @@ Designed *Gui::mouseUp(int x, int y) { _bordersDirty = true; } - for (ObjList::const_iterator it = _scene->_objs.begin(); it != _scene->_objs.end(); ++it) { + for (ObjList::const_iterator it = _scene->_objs.end(); it != _scene->_objs.begin(); ) { + it--; if ((*it)->_design->isPointOpaque(x - _sceneArea.left + kBorderWidth, y - _sceneArea.top + kBorderWidth)) return *it; } - for (ChrList::const_iterator it = _scene->_chrs.begin(); it != _scene->_chrs.end(); ++it) { + for (ChrList::const_iterator it = _scene->_chrs.end(); it != _scene->_chrs.begin(); ) { + it--; if ((*it)->_design->isPointOpaque(x - _sceneArea.left + kBorderWidth, y - _sceneArea.top + kBorderWidth)) return *it; } diff --git a/engines/wage/gui.h b/engines/wage/gui.h index 48ec41c30a..dc3a593bda 100644 --- a/engines/wage/gui.h +++ b/engines/wage/gui.h @@ -51,18 +51,16 @@ #include "common/str-array.h" #include "graphics/font.h" #include "graphics/fontman.h" -#include "graphics/surface.h" +#include "graphics/managed_surface.h" #include "common/rect.h" +#include "wage/macwindow.h" +#include "wage/macwindowmanager.h" + namespace Wage { class Menu; -enum WindowType { - kWindowScene, - kWindowConsole -}; - enum { kMenuHeight = 20, kMenuLeftMargin = 7, @@ -71,7 +69,6 @@ enum { kMenuDropdownPadding = 14, kMenuDropdownItemHeight = 16, kMenuItemHeight = 20, - kBorderWidth = 17, kDesktopArc = 7, kComponentsPadding = 10, kCursorHeight = 12 @@ -84,13 +81,6 @@ enum { kPatternCheckers2 = 4 }; -enum { - kBorderNone = 0, - kBorderScrollUp, - kBorderScrollDown, - kBorderCloseButton -}; - class Gui { public: Gui(WageEngine *engine); @@ -120,16 +110,18 @@ public: void disableAllMenus(); void enableNewGameMenus(); + bool builtInFonts() { return _builtInFonts; } + 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::ManagedSurface *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); + void renderConsole(Graphics::ManagedSurface *g, const Common::Rect &r); + void drawBox(Graphics::ManagedSurface *g, int x, int y, int w, int h); + void fillRect(Graphics::ManagedSurface *g, int x, int y, int w, int h, int color = kColorBlack); void loadFonts(); void flowText(Common::String &str); const Graphics::Font *getConsoleFont(); @@ -140,7 +132,7 @@ private: void updateTextSelection(int x, int y); public: - Graphics::Surface _screen; + Graphics::ManagedSurface _screen; int _cursorX, _cursorY; bool _cursorState; Common::Rect _consoleTextArea; @@ -157,7 +149,7 @@ public: bool _menuDirty; private: - Graphics::Surface _console; + Graphics::ManagedSurface _console; Menu *_menu; Scene *_scene; bool _sceneDirty; @@ -185,6 +177,10 @@ private: Common::String _undobuffer; int _inputTextLineNum; + + MacWindowManager _wm; + int _sceneWindowId; + int _consoleWindowId; }; } // End of namespace Wage diff --git a/engines/wage/macwindow.cpp b/engines/wage/macwindow.cpp new file mode 100644 index 0000000000..41d842286a --- /dev/null +++ b/engines/wage/macwindow.cpp @@ -0,0 +1,233 @@ +/* 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. + * + * MIT License: + * + * Copyright (c) 2009 Alexei Svitkine, Eugene Sandulenko + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + */ + +#include "graphics/primitives.h" + +#include "wage/wage.h" +#include "wage/gui.h" +#include "wage/macwindow.h" + +namespace Wage { + +MacWindow::MacWindow(bool scrollable) : _scrollable(scrollable) { + _active = false; + _borderIsDirty = true; + + _highlightedPart = kBorderNone; + + _scrollPos = _scrollSize = 0.0; +} + +MacWindow::~MacWindow() { +} + +void MacWindow::setActive(bool active) { + if (active == _active) + return; + + _active = active; + _borderIsDirty = true; +} + +void MacWindow::resize(int w, int h) { + if (_surface.w == w && _surface.h == h) + return; + + _surface.free(); + _surface.create(w, h, Graphics::PixelFormat::createFormatCLUT8()); + _borderSurface.free(); + _borderSurface.create(w, h, Graphics::PixelFormat::createFormatCLUT8()); + _composeSurface.free(); + _composeSurface.create(w, h, Graphics::PixelFormat::createFormatCLUT8()); + + _dims.setWidth(w); + _dims.setHeight(h); +} + +void MacWindow::move(int x, int y) { + _dims.moveTo(x, y); +} + +void MacWindow::setDimensions(const Common::Rect &r) { + resize(r.width(), r.height()); + _dims.moveTo(r.left, r.top); +} + +void MacWindow::draw(Graphics::ManagedSurface *g, bool forceRedraw) { + if (_borderIsDirty || forceRedraw) + drawBorder(); + + // Compose + _composeSurface.blitFrom(_surface, Common::Rect(0, 0, _surface.w - 2, _surface.h - 2), Common::Point(2, 2)); + _composeSurface.transBlitFrom(_borderSurface, kColorGreen); + + g->transBlitFrom(_composeSurface, _composeSurface.getBounds(), Common::Point(_dims.left - 2, _dims.top - 2), kColorGreen2); +} + +const Graphics::Font *MacWindow::getTitleFont() { + return ((WageEngine *)g_engine)->_gui->getFont("Chicago-12", Graphics::FontManager::kBigGUIFont); +} + +bool MacWindow::builtInFonts() { + return ((WageEngine *)g_engine)->_gui->builtInFonts(); +} + +#define ARROW_W 12 +#define ARROW_H 6 +const int arrowPixels[ARROW_H][ARROW_W] = { + {0,0,0,0,0,1,1,0,0,0,0,0}, + {0,0,0,0,1,1,1,1,0,0,0,0}, + {0,0,0,1,1,1,1,1,1,0,0,0}, + {0,0,1,1,1,1,1,1,1,1,0,0}, + {0,1,1,1,1,1,1,1,1,1,1,0}, + {1,1,1,1,1,1,1,1,1,1,1,1}}; + +static void drawPixelInverted(int x, int y, int color, void *data) { + Graphics::ManagedSurface *surface = (Graphics::ManagedSurface *)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 MacWindow::drawBorder() { + _borderIsDirty = false; + + bool active = _active, scrollable = _scrollable, closeable = _active, drawTitle = !_title.empty(); + const int size = kBorderWidth; + int x = 0; + int y = 0; + int width = _borderSurface.w; + int height = _borderSurface.h; + Graphics::ManagedSurface *g = &_borderSurface; + + // We draw rect with outer kColorGreen2 and inner kColorGreen, so on 2 passes we cut out + // scene by external shape of the border + int sz = kBorderWidth / 2; + g->clear(kColorGreen2); + g->fillRect(Common::Rect(sz, sz, width - sz, height - sz), kColorGreen); + + drawBox(g, x, y, size, size); + drawBox(g, x + width - size - 1, y, size, size); + drawBox(g, x + width - size - 1, y + height - size - 1, size, size); + drawBox(g, x, y + height - size - 1, size, size); + drawBox(g, x + size, y + 2, width - 2 * size - 1, size - 4); + drawBox(g, x + size, y + height - size + 1, width - 2 * size - 1, size - 4); + drawBox(g, x + 2, y + size, size - 4, height - 2 * size - 1); + drawBox(g, x + width - size + 1, y + size, size - 4, height - 2 * size - 1); + + if (active) { + fillRect(g, x + size, y + 5, width - 2 * size - 1, 8); + fillRect(g, x + size, y + height - 13, width - 2 * size - 1, 8); + fillRect(g, x + 5, y + size, 8, height - 2 * size - 1); + if (!scrollable) { + fillRect(g, x + width - 13, y + size, 8, height - 2 * size - 1); + } else { + int x1 = x + width - 15; + int y1 = y + size + 1; + + for (int yy = 0; yy < ARROW_H; yy++) { + 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, 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++) + 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 + _dims.height() * _scrollPos; + int rx2 = rx1 + size - 4; + int ry2 = ry1 + _dims.height() * _scrollSize; + Common::Rect rr(rx1, ry1, rx2, ry2); + + Graphics::drawFilledRect(rr, kColorBlack, drawPixelInverted, g); + } + } + if (closeable) { + if (_highlightedPart == kBorderCloseButton) { + fillRect(g, x + 6, y + 6, 6, 6); + } else { + drawBox(g, x + 5, y + 5, 7, 7); + } + } + } + + if (drawTitle) { + const Graphics::Font *font = getTitleFont(); + int yOff = builtInFonts() ? 3 : 1; + + int w = font->getStringWidth(_title) + 10; + int maxWidth = width - size * 2 - 7; + if (w > maxWidth) + w = maxWidth; + drawBox(g, x + (width - w) / 2, y, w, size); + font->drawString(g, _title, x + (width - w) / 2 + 5, y + yOff, w, kColorBlack); + } +} + +void MacWindow::drawBox(Graphics::ManagedSurface *g, int x, int y, int w, int h) { + Common::Rect r(x, y, x + w + 1, y + h + 1); + + g->fillRect(r, kColorWhite); + g->frameRect(r, kColorBlack); +} + +void MacWindow::fillRect(Graphics::ManagedSurface *g, int x, int y, int w, int h, int color) { + Common::Rect r(x, y, x + w, y + h); + + g->fillRect(r, color); +} + +} // End of namespace Wage diff --git a/engines/wage/macwindow.h b/engines/wage/macwindow.h new file mode 100644 index 0000000000..e635528c23 --- /dev/null +++ b/engines/wage/macwindow.h @@ -0,0 +1,110 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * MIT License: + * + * Copyright (c) 2009 Alexei Svitkine, Eugene Sandulenko + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + */ + +#ifndef WAGE_MACWINDOW_H +#define WAGE_MACWINDOW_H + +#include "graphics/managed_surface.h" + +namespace Wage { + +enum WindowType { + kWindowScene, + kWindowConsole +}; + +enum { + kBorderWidth = 17 +}; + +enum BorderHighlight { + kBorderNone = 0, + kBorderScrollUp, + kBorderScrollDown, + kBorderCloseButton +}; + +class MacWindow { +public: + MacWindow(bool scrollable); + ~MacWindow(); + void move(int x, int y); + void resize(int w, int h); + void setDimensions(const Common::Rect &r); + void draw(Graphics::ManagedSurface *g, bool forceRedraw = false); + void setActive(bool active); + Graphics::ManagedSurface *getSurface() { return &_surface; } + void setTitle(Common::String &title) { _title = title; } + void setHighlight(BorderHighlight highlightedPart) { _highlightedPart = highlightedPart; } + void setScroll(float scrollPos, float scrollSize) { _scrollPos = scrollPos; _scrollSize = scrollSize; } + +private: + void drawBorder(); + void drawBox(Graphics::ManagedSurface *g, int x, int y, int w, int h); + void fillRect(Graphics::ManagedSurface *g, int x, int y, int w, int h, int color = kColorBlack); + const Graphics::Font *getTitleFont(); + bool builtInFonts(); + +private: + Graphics::ManagedSurface _surface; + Graphics::ManagedSurface _borderSurface; + Graphics::ManagedSurface _composeSurface; + bool _scrollable; + bool _active; + bool _borderIsDirty; + + BorderHighlight _highlightedPart; + float _scrollPos, _scrollSize; + + Common::Rect _dims; + + Common::String _title; +}; + +} // End of namespace Wage + +#endif diff --git a/engines/wage/macwindowmanager.cpp b/engines/wage/macwindowmanager.cpp new file mode 100644 index 0000000000..72f01fac67 --- /dev/null +++ b/engines/wage/macwindowmanager.cpp @@ -0,0 +1,104 @@ +/* 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. + * + * MIT License: + * + * Copyright (c) 2009 Alexei Svitkine, Eugene Sandulenko + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + */ + +#include "common/list.h" +#include "common/array.h" + +#include "graphics/managed_surface.h" + +#include "wage/wage.h" +#include "wage/macwindow.h" +#include "wage/macwindowmanager.h" + +namespace Wage { + +MacWindowManager::MacWindowManager() { + _lastId = 0; + _activeWindow = -1; +} + +MacWindowManager::~MacWindowManager() { + for (uint i = 0; i < _lastId; i++) + delete _windows[i]; +} + +int MacWindowManager::add(bool scrollable) { + MacWindow *w = new MacWindow(scrollable); + + _windows.push_back(w); + _windowStack.push_back(w); + + _activeWindow = _lastId; + + _lastId++; + + return _activeWindow; +} + +void MacWindowManager::setActive(int id) { + if (_activeWindow == id) + return; + + if (_activeWindow != -1) + _windows[_activeWindow]->setActive(false); + + _windows[id]->setActive(true); + + _windowStack.remove(_windows[id]); + _windowStack.push_back(_windows[id]); + + _fullRefresh = true; +} + +void MacWindowManager::draw(Graphics::ManagedSurface *g) { + for (Common::List<MacWindow *>::const_iterator it = _windowStack.begin(); it != _windowStack.end(); it++) + (*it)->draw(g, _fullRefresh); + + _fullRefresh = false; +} + +} // End of namespace Wage diff --git a/engines/wage/macwindowmanager.h b/engines/wage/macwindowmanager.h new file mode 100644 index 0000000000..1c8ed02a85 --- /dev/null +++ b/engines/wage/macwindowmanager.h @@ -0,0 +1,79 @@ +/* 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. + * + * MIT License: + * + * Copyright (c) 2009 Alexei Svitkine, Eugene Sandulenko + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + */ + +#ifndef WAGE_MACWINDOWMANAGER_H +#define WAGE_MACWINDOWMANAGER_H + +namespace Wage { + +class MacWindow; + +class MacWindowManager { +public: + MacWindowManager(); + ~MacWindowManager(); + + int add(bool scrollable); + void setActive(int id); + + void draw(Graphics::ManagedSurface *g); + + MacWindow *getWindow(int id) { return _windows[id]; } + +private: + Common::List<MacWindow *> _windowStack; + Common::Array<MacWindow *> _windows; + + int _lastId; + int _activeWindow; + + bool _fullRefresh; +}; + +} // End of namespace Wage + +#endif diff --git a/engines/wage/menu.cpp b/engines/wage/menu.cpp index 12ef8c2219..27cbf5e4f5 100644 --- a/engines/wage/menu.cpp +++ b/engines/wage/menu.cpp @@ -397,7 +397,7 @@ void Menu::renderSubmenu(MenuItem *menu) { } if (!text.empty()) { - Graphics::Surface *s = &_gui->_screen; + Graphics::ManagedSurface *s = &_gui->_screen; int tx = x, ty = y; if (!menu->subitems[i]->enabled) { @@ -406,7 +406,7 @@ void Menu::renderSubmenu(MenuItem *menu) { ty = 0; accelX -= x; - _tempSurface.fillRect(Common::Rect(0, 0, _tempSurface.w, _tempSurface.h), kColorGreen); + _tempSurface.clear(kColorGreen); } _font->drawString(s, text, tx, ty, r->width(), color); diff --git a/engines/wage/menu.h b/engines/wage/menu.h index 3550356bc6..916ef6d50e 100644 --- a/engines/wage/menu.h +++ b/engines/wage/menu.h @@ -111,8 +111,8 @@ public: private: Gui *_gui; - Graphics::Surface _screenCopy; - Graphics::Surface _tempSurface; + Graphics::ManagedSurface _screenCopy; + Graphics::ManagedSurface _tempSurface; private: const Graphics::Font *getMenuFont(); diff --git a/engines/wage/module.mk b/engines/wage/module.mk index 21316bbf83..d65934fc2b 100644 --- a/engines/wage/module.mk +++ b/engines/wage/module.mk @@ -9,6 +9,8 @@ MODULE_OBJS := \ entities.o \ gui.o \ gui-console.o \ + macwindow.o \ + macwindowmanager.o \ menu.o \ randomhat.o \ script.o \ diff --git a/engines/wage/script.cpp b/engines/wage/script.cpp index 294c08ed82..61336dce88 100644 --- a/engines/wage/script.cpp +++ b/engines/wage/script.cpp @@ -1099,7 +1099,7 @@ struct Mapping { { "\?\?\?(0xf5)", OPCODE }, { "\?\?\?(0xf6)", OPCODE }, { "\?\?\?(0xf7)", OPCODE }, - { "\?\?\?(0xf8)", OPCODE }, // 0xa8 + { "\?\?\?(0xf8)", OPCODE }, // 0xf8 { "\?\?\?(0xf9)", OPCODE }, { "\?\?\?(0xfa)", OPCODE }, { "\?\?\?(0xfb)", OPCODE }, diff --git a/engines/wage/wage.cpp b/engines/wage/wage.cpp index aa480b63fe..3a52aed1c4 100644 --- a/engines/wage/wage.cpp +++ b/engines/wage/wage.cpp @@ -388,6 +388,7 @@ void WageEngine::onMove(Designed *what, Designed *from, Designed *to) { if (!_temporarilyHidden) { if (to == currentScene || from == currentScene) { redrawScene(); + g_system->updateScreen(); g_system->delayMillis(100); } } @@ -399,6 +400,7 @@ void WageEngine::redrawScene() { if (currentScene != NULL) { bool firstTime = (_lastScene != currentScene); + _gui->draw(); updateSoundTimerForScene(currentScene, firstTime); } } diff --git a/engines/wage/wage.h b/engines/wage/wage.h index a0be7a70a9..87009c2350 100644 --- a/engines/wage/wage.h +++ b/engines/wage/wage.h @@ -104,10 +104,11 @@ enum { }; enum { - kColorBlack = 0, - kColorGray = 1, - kColorWhite = 2, - kColorGreen = 3 + kColorBlack = 0, + kColorGray = 1, + kColorWhite = 2, + kColorGreen = 3, + kColorGreen2 = 4 }; Common::String readPascalString(Common::SeekableReadStream *in); diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp index 40b1555e35..954a425b7b 100644 --- a/engines/wage/world.cpp +++ b/engines/wage/world.cpp @@ -105,6 +105,18 @@ bool World::loadWorld(Common::MacResManager *resMan) { Common::SeekableReadStream *res; Common::MacResIDArray::const_iterator iter; + // Dumping interpreter code +#if 1 + res = resMan->getResource(MKTAG('C','O','D','E'), 1); + warning("code size: %d", res->size()); + byte *buf = (byte *)malloc(res->size()); + res->read(buf, res->size()); + Common::DumpFile out; + out.open("code.bin"); + out.write(buf, res->size()); + out.close(); +#endif + if ((resArray = resMan->getResIDArray(MKTAG('G','C','O','D'))).size() == 0) return false; @@ -419,7 +431,7 @@ static bool objComparator(const Obj *o1, const Obj *o2) { bool o1Immobile = (o1->_type == Obj::IMMOBILE_OBJECT); bool o2Immobile = (o2->_type == Obj::IMMOBILE_OBJECT); if (o1Immobile == o2Immobile) { - return o1->_index - o2->_index; + return o1->_index < o2->_index; } return o1Immobile; } diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp index cc1c00b6d0..767101b952 100644 --- a/engines/zvision/core/events.cpp +++ b/engines/zvision/core/events.cpp @@ -35,6 +35,7 @@ #include "common/events.h" #include "common/system.h" #include "common/rational.h" +#include "audio/mixer.h" #include "engines/util.h" diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h index bde1baa291..98d216a6d5 100644 --- a/engines/zvision/scripting/actions.h +++ b/engines/zvision/scripting/actions.h @@ -26,8 +26,6 @@ #include "common/str.h" #include "common/rect.h" -#include "audio/mixer.h" - namespace ZVision { // Forward declaration of ZVision. This file is included before ZVision is declared diff --git a/engines/zvision/sound/midi.cpp b/engines/zvision/sound/midi.cpp index 3dd66ff2d4..9366f9e1e4 100644 --- a/engines/zvision/sound/midi.cpp +++ b/engines/zvision/sound/midi.cpp @@ -22,6 +22,7 @@ #include "common/scummsys.h" #include "common/textconsole.h" +#include "audio/mididrv.h" #include "zvision/sound/midi.h" diff --git a/engines/zvision/sound/midi.h b/engines/zvision/sound/midi.h index a3bac19636..020c65c9f7 100644 --- a/engines/zvision/sound/midi.h +++ b/engines/zvision/sound/midi.h @@ -23,7 +23,7 @@ #ifndef ZVISION_MIDI_H #define ZVISION_MIDI_H -#include "audio/mididrv.h" +class MidiDriver; namespace ZVision { diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp index b0d69c5f94..05db284f62 100644 --- a/engines/zvision/zvision.cpp +++ b/engines/zvision/zvision.cpp @@ -34,13 +34,13 @@ #include "zvision/text/text.h" #include "zvision/text/truetype_font.h" #include "zvision/sound/midi.h" -#include "zvision/file/zfs_archive.h" #include "common/config-manager.h" #include "common/str.h" #include "common/debug.h" #include "common/debug-channels.h" #include "common/textconsole.h" +#include "common/timer.h" #include "common/error.h" #include "common/system.h" #include "common/file.h" diff --git a/gui/debugger.cpp b/gui/debugger.cpp index c9b435963d..72d05e2973 100644 --- a/gui/debugger.cpp +++ b/gui/debugger.cpp @@ -42,6 +42,7 @@ #elif defined(USE_READLINE) #include <readline/readline.h> #include <readline/history.h> + #include "common/events.h" #endif @@ -191,6 +192,15 @@ char *readline_completionFunction(const char *text, int state) { return g_readline_debugger->readlineComplete(text, state); } +void readline_eventFunction() { + Common::EventManager *eventMan = g_system->getEventManager(); + + Common::Event event; + while (eventMan->pollEvent(event)) { + // drop all events + } +} + #ifdef USE_READLINE_INT_COMPLETION typedef int RLCompFunc_t(const char *, int); #else @@ -228,6 +238,7 @@ void Debugger::enter() { g_readline_debugger = this; rl_completion_entry_function = (RLCompFunc_t *)&readline_completionFunction; + rl_event_hook = (rl_hook_func_t *)&readline_eventFunction; char *line_read = 0; do { diff --git a/gui/options.cpp b/gui/options.cpp index ecd1607e1b..2bb17509eb 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -72,7 +72,7 @@ enum { kSubtitlesBoth }; -#ifdef SMALL_SCREEN_DEVICE +#ifdef GUI_ENABLE_KEYSDIALOG enum { kChooseKeyMappingCmd = 'chma' }; @@ -206,12 +206,12 @@ void OptionsDialog::open() { _renderModePopUp->setSelectedTag(sel); } -#ifdef SMALL_SCREEN_DEVICE +#ifdef GUI_ONLY_FULLSCREEN _fullscreenCheckbox->setState(true); _fullscreenCheckbox->setEnabled(false); _aspectCheckbox->setState(false); _aspectCheckbox->setEnabled(false); -#else // !SMALL_SCREEN_DEVICE +#else // !GUI_ONLY_FULLSCREEN // Fullscreen setting _fullscreenCheckbox->setState(ConfMan.getBool("fullscreen", _domain)); @@ -223,7 +223,7 @@ void OptionsDialog::open() { _aspectCheckbox->setEnabled(true); _aspectCheckbox->setState(ConfMan.getBool("aspect_ratio", _domain)); } -#endif // SMALL_SCREEN_DEVICE +#endif // GUI_ONLY_FULLSCREEN } @@ -606,7 +606,7 @@ void OptionsDialog::setGraphicSettingsState(bool enabled) { _gfxPopUp->setEnabled(enabled); _renderModePopUpDesc->setEnabled(enabled); _renderModePopUp->setEnabled(enabled); -#ifndef SMALL_SCREEN_DEVICE +#ifndef GUI_ENABLE_KEYSDIALOG _fullscreenCheckbox->setEnabled(enabled); if (_guioptions.contains(GUIO_NOASPECT)) _aspectCheckbox->setEnabled(false); @@ -870,10 +870,6 @@ void OptionsDialog::addMIDIControls(GuiObject *boss, const Common::String &prefi _midiGainSlider->setMaxValue(1000); _midiGainLabel = new StaticTextWidget(boss, prefix + "mcMidiGainLabel", "1.00"); -#ifdef USE_FLUIDSYNTH - new ButtonWidget(boss, prefix + "mcFluidSynthSettings", _("FluidSynth Settings"), 0, kFluidSynthSettingsCmd); -#endif - _enableMIDISettings = true; } @@ -1111,6 +1107,10 @@ GlobalOptionsDialog::GlobalOptionsDialog() _midiTabId = tab->addTab(_("MIDI")); addMIDIControls(tab, "GlobalOptions_MIDI."); +#ifdef USE_FLUIDSYNTH + new ButtonWidget(tab, "GlobalOptions_MIDI.mcFluidSynthSettings", _("FluidSynth Settings"), 0, kFluidSynthSettingsCmd); +#endif + // // 4) The MT-32 tab // @@ -1196,7 +1196,7 @@ GlobalOptionsDialog::GlobalOptionsDialog() _autosavePeriodPopUp->appendEntry(_(savePeriodLabels[i]), savePeriodValues[i]); } -#ifdef SMALL_SCREEN_DEVICE +#ifdef GUI_ENABLE_KEYSDIALOG new ButtonWidget(tab, "GlobalOptions_Misc.KeysButton", _("Keys"), 0, kChooseKeyMappingCmd); #endif @@ -1255,7 +1255,7 @@ GlobalOptionsDialog::GlobalOptionsDialog() new ButtonWidget(this, "GlobalOptions.Cancel", _("Cancel"), 0, kCloseCmd); new ButtonWidget(this, "GlobalOptions.Ok", _("OK"), 0, kOKCmd); -#ifdef SMALL_SCREEN_DEVICE +#ifdef GUI_ENABLE_KEYSDIALOG _keysDialog = new KeysDialog(); #endif @@ -1265,7 +1265,7 @@ GlobalOptionsDialog::GlobalOptionsDialog() } GlobalOptionsDialog::~GlobalOptionsDialog() { -#ifdef SMALL_SCREEN_DEVICE +#ifdef GUI_ENABLE_KEYSDIALOG delete _keysDialog; #endif @@ -1509,7 +1509,7 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3 } break; } -#ifdef SMALL_SCREEN_DEVICE +#ifdef GUI_ENABLE_KEYSDIALOG case kChooseKeyMappingCmd: _keysDialog->runModal(); break; diff --git a/gui/options.h b/gui/options.h index 6f4046381d..294b41794b 100644 --- a/gui/options.h +++ b/gui/options.h @@ -29,7 +29,7 @@ #include "common/str.h" #include "audio/mididrv.h" -#ifdef SMALL_SCREEN_DEVICE +#ifdef GUI_ENABLE_KEYSDIALOG #include "gui/KeysDialog.h" #endif @@ -210,7 +210,7 @@ public: virtual void reflowLayout(); protected: -#ifdef SMALL_SCREEN_DEVICE +#ifdef GUI_ENABLE_KEYSDIALOG KeysDialog *_keysDialog; #endif #ifdef USE_FLUIDSYNTH diff --git a/gui/recorderdialog.cpp b/gui/recorderdialog.cpp index 2d74cebbb6..c08b3e149a 100644 --- a/gui/recorderdialog.cpp +++ b/gui/recorderdialog.cpp @@ -33,7 +33,6 @@ #include "gui/editrecorddialog.h" #include "gui/EventRecorder.h" #include "gui/message.h" -#include "gui/saveload.h" #include "common/system.h" #include "gui/ThemeEval.h" #include "gui/gui-manager.h" diff --git a/gui/saveload.cpp b/gui/saveload.cpp index c1c1d12ec5..b94d30289b 100644 --- a/gui/saveload.cpp +++ b/gui/saveload.cpp @@ -25,7 +25,6 @@ #include "gui/saveload.h" #include "gui/saveload-dialog.h" -#include "gui/gui-manager.h" #include "engines/metaengine.h" diff --git a/gui/saveload.h b/gui/saveload.h index 22c26d4c5e..01a78c4924 100644 --- a/gui/saveload.h +++ b/gui/saveload.h @@ -23,7 +23,7 @@ #ifndef GUI_SAVELOAD_H #define GUI_SAVELOAD_H -#include "gui/dialog.h" +#include "common/str.h" #include "engines/metaengine.h" namespace GUI { diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat Binary files differindex cd827ff0c2..917acdb13d 100644 --- a/gui/themes/translations.dat +++ b/gui/themes/translations.dat diff --git a/gui/widget.cpp b/gui/widget.cpp index 11b1ed66f0..4143111e54 100644 --- a/gui/widget.cpp +++ b/gui/widget.cpp @@ -356,6 +356,7 @@ void ButtonWidget::handleTickle() { void ButtonWidget::setPressedState() { wantTickle(true); setFlags(WIDGET_PRESSED); + clearFlags(WIDGET_HILITED); draw(); } diff --git a/po/be_BY.po b/po/be_BY.po index 3ed608e471..20bc062b5e 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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\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" @@ -56,10 +56,11 @@ msgstr "Уверх" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -173,7 +174,7 @@ msgstr "Сінусоіда" msgid "Triangle" msgstr "Трохкутная" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Рознае" @@ -207,7 +208,7 @@ msgstr "Скінуць налады FluidSynth па змаўчанні." #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -240,15 +241,15 @@ msgstr "Закрыць" msgid "Mouse click" msgstr "Клік мышшу" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Паказаць клавіятуру" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Перапрызначыць клавішы" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "Пераключэнне на ўвесь экран" @@ -324,8 +325,8 @@ msgstr "" "Мова гульні. Змена гэтай налады не ператворыць рускую версію гульні ў " "беларускую" -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<па змаўчанні>" @@ -347,11 +348,11 @@ msgstr "Платформа:" msgid "Engine" msgstr "Рухавічок" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Графіка" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "Грф" @@ -364,7 +365,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Перакрыць глабальныя налады графікі" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Аўдыё" @@ -377,11 +378,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Перакрыць глабальныя налады аўдыё" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Гучнасць" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "Гучнасць" @@ -395,7 +396,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Перакрыць глабальныя налады гучнасці" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -408,7 +409,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Перакрыць глабальныя налады MIDI" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -421,11 +422,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Перакрыць глабальныя налады MT-32" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Шляхі" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Шляхі" @@ -439,7 +440,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Шлях да гульні:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Дад. шлях:" @@ -447,42 +448,42 @@ msgstr "Дад. шлях:" msgid "Specifies path to additional data used by the game" msgstr "Паказвае шлях да дадатковых файлаў, дадзеных для гульні" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Дад. шлях:" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Захаванні гульняў:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Паказвае шлях да захаванняў гульні" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Захаванні гульняў:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Не зададзены" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Па змаўчанні" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "Абярыце SoundFont" @@ -494,7 +495,7 @@ msgstr "Абярыце дырэкторыю з файламі гульні" msgid "Select additional game directory" msgstr "Абярыце дадатковую дырэкторыю гульні" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Абярыце дырэкторыю для захаванняў" @@ -688,132 +689,132 @@ msgstr "Пераключыцца ў гульню" msgid "Fast replay" msgstr "Хуткае прайграванне" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Ніколі" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "кожныя 5 хвілін" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "кожныя 10 хвілін" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "кожныя 15 хвілін" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "кожныя 30 хвілін" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 кГц" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 кГц" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 кГц" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 кГц" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 кГц" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Не зададзены" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Не атрымалася ўжыць змены некаторых графічных налад:" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "відэарэжым не можа быць зменены." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "поўнаэкранны рэжым не можа быць зменены" -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "рэжым карэктыроўкі суадносін бакоў не можа быць зменены" -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Граф. рэжым:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Рэжым растру:" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Спецыяльныя рэжымы рэндэрынгу, падтрымоўваныя некаторымі гульнямі" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "Поўнаэкранны рэжым" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Карэкцыя суадносін бакоў" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "Карэктаваць суадносіны бакоў для гульняў з адрозненнем 320x200" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Упадабаная прылада:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Гукавая прылада:" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "Зазначае ўпадабаную гукавую прыладу ці эмулятар гукавой карты" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "Зазначае выходную гукавую прыладу ці эмулятар гукавой карты" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Упадабаная:" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Гукавая прылада:" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "Эмулятар AdLib:" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "Гукавая карта AdLib выкарыстоўваецца многімі гульнямі" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "Чашчыня гуку:" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -821,68 +822,68 @@ msgstr "" "Большыя значэнні задаюць лепшую якасць гуку, аднак яны могуць не " "падтрымлівацца вашай гукавой картай" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "Прылада GM:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "Зазначае выходную гукавую прыладу для MIDI" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "Не выкарыстоўваць музыку для General MIDI" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "Выкарыстоўваць першую даступную прыладу" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "SoundFont'ы падтрымліваюцца некаторымі гукавымі картамі, FluidSynth ды " "Timidity" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "Змешаны рэжым AdLib/MIDI" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "Выкарыстоўваць і MIDI, і AdLib для генерацыі гуку" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "Узмацненне MIDI:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "Налады FluidSynth" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "Нал. MT-32:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Паказвае гукавую прыладу па змаўчанні для вываду на Roland MT-32/LAPC1/CM32l/" "CM64" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Сапраўдны Roland MT-32 (забараніць эмуляцыю GM)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -890,16 +891,16 @@ msgstr "" "Адзначце, калі ў вас падключана Roland-сумяшчальная гукавая прылада і вы " "жадаеце яе выкарыстоўваць" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Сапраўдны Roland MT-32 (без эмуляцыі GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Рэжым Roland GS (дазволіць мапінг MT-32)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -907,171 +908,183 @@ msgstr "" "Адзначце, калі жадаеце дазволіць мапінг для эмуляцыі MT-32 на прыладзе " "Rolans GS" -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "Не выкарыстоўваць музыку для MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Тэкст і агучка:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Агучка" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Субтытры" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Абое" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Хуткасць тытраў:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Тэкст і агучка:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Агуч" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Суб" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "Абое" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Паказваць субтытры і прайграваць гаворку" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Хуткасць тытраў:" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Гучн. музыкі:" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Гучн. музыкі:" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Выкл. усё" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "Гучнасць SFX:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Гучнасць спецыяльных гукавых эфектаў" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "Гучнасць SFX:" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Гучн. агучкі:" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Гучн. агучкі:" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Шлях да тэм:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Шлях да тэм:" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Паказвае шлях да дадатковых файлаў дадзеных, выкарыстоўваных усімі гульнямі " "або ScummVM" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Шлях да плагінаў:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Шлях да плагінаў:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Рознае" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Тэма" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "Малявалка GUI:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Аўтазахаванне:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Аўтазахаванне:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Клавішы" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "Мова GUI:" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "Мова графічнага інтэрфейсу ScummVM" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Вы павінны перазапусціць ScummVM, каб ужыць змены." -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Не магу пісаць у абраную дырэкторыю. Калі ласка, азначце іншую." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Абярыце дырэкторыю для тэм GUI" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Абярыце дырэкторыю з дадатковымі файламі" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Абярыце дырэкторыю з плагінамі" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1244,39 +1257,60 @@ msgstr "Растарызатар са згладжваннем" msgid "Antialiased" msgstr "Са згладжваннем" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "" + +#: gui/updates-dialog.cpp:92 +#, fuzzy +msgid "Check for updates automatically" +msgstr "Правяраю абнаўленні..." + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Ачысціць значэнне" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Рухавічок не падтрымлівае ўзровень адладкі '%s'" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Меню" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Прапусціць" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Паўза" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Прапусціць радок" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Памылка запуску гульні:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "Не магу знайсці рухавічок для запуску абранай гульні" @@ -1371,6 +1405,23 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Бурштынавы" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "" + +#: common/updates.cpp:64 +#, fuzzy +msgid "<Bad value>" +msgstr "Ачысціць значэнне" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2309,7 +2360,7 @@ msgstr "" "Не забудзьцеся прызначыць клавішу для дзеяння 'Hide Toolbar', каб убачыць " "увесь інвентар у гульні" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "Правяраю абнаўленні..." @@ -2881,6 +2932,15 @@ msgid "" msgstr "" "Выкарыстоўваць альтэрнатыўны набор срэбных курсораў замест звычайных залатых" +#: engines/scumm/detection.cpp:1335 +#, fuzzy +msgid "Show Object Line" +msgstr "Паказваць назвы аб'ектаў" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/po/ca_ES.po b/po/ca_ES.po index 280adc21bd..baffd40199 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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\n" "PO-Revision-Date: 2013-05-05 14:16+0100\n" "Last-Translator: Jordi Vilalta Prat <jvprat@jvprat.com>\n" "Language-Team: Catalan <scummvm-devel@lists.sf.net>\n" @@ -53,10 +53,11 @@ msgstr "Amunt" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -171,7 +172,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "Triangle" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Misc" @@ -205,7 +206,7 @@ msgstr "Retorna tots els ajustos de FluidSynth als seus valors per defecte." #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -240,15 +241,15 @@ msgstr "Tanca" msgid "Mouse click" msgstr "Clic del ratolэ" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Mostra el teclat" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Assigna les tecles" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "Commuta la pantalla completa" @@ -324,8 +325,8 @@ msgstr "" "Idioma del joc. Aixђ no convertirр la vostra versiѓ Espanyola del joc a " "Anglшs" -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<per defecte>" @@ -347,11 +348,11 @@ msgstr "Platafor.:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Grрfics" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "GFX" @@ -364,7 +365,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Canviar les opcions de grрfics" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Рudio" @@ -377,11 +378,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Canviar les opcions d'рudio" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "Volum" @@ -395,7 +396,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Canviar les opcions de volum" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -408,7 +409,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Canviar les opcions de MIDI" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -421,11 +422,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Canviar les opcions de MT-32" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Camins" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Camins" @@ -439,7 +440,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Camэ joc:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Camэ extra:" @@ -447,42 +448,42 @@ msgstr "Camэ extra:" msgid "Specifies path to additional data used by the game" msgstr "Especifica el camэ de dades addicionals utilitzades pel joc" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Camэ extra:" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Camэ de partides:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Especifica on es desaran les partides" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Partides:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Cap" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Per defecte" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "Seleccioneu el fitxer SoundFont" @@ -494,7 +495,7 @@ msgstr "Seleccioneu el directori amb les dades del joc" msgid "Select additional game directory" msgstr "Seleccioneu el directori addicional del joc" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Seleccioneu el directori de les partides desades" @@ -696,132 +697,132 @@ msgstr "Commuta" msgid "Fast replay" msgstr "Mode rрpid" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Mai" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "cada 5 minuts" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "cada 10 minuts" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "cada 15 minuts" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "cada 30 minuts" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Cap" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "No s'han pogut aplicar alguns canvis de les opcions grрfiques:" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "no s'ha pogut canviar el mode de vэdeo" -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "no s'ha pogut canviar l'ajust de pantalla completa" -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "no s'ha pogut canviar l'ajust de la correcciѓ d'aspecte" -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Mode grрfic:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Mode de pintat:" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Modes de tramat especials suportats per alguns jocs" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "Mode pantalla completa" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Correcciѓ de la relaciѓ d'aspecte" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "Corregeix la relaciѓ d'aspecte per jocs de 320x200" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Disp. preferit:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "Especifica el dispositiu de so o l'emulador de tarja de so preferit" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "Especifica el dispositiu de so o l'emulador de tarja de so de sortida" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferit:" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "Emulador AdLib:" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "AdLib s'utilitza per la mњsica de molts jocs" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "Freq. sortida:" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -829,67 +830,67 @@ msgstr "" "Valors mщs alts especifiquen millor qualitat de so perђ pot ser que la " "vostra tarja de so no ho suporti" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "Dispositiu GM:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "" "Especifica el dispositiu de so per defecte per a la sortida General MIDI" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "No utilitzis mњsica General MIDI" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "Utilitza el primer dispositiu disponible" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "Fitxer SoundFont:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "Algunes targes de so, FluidSynth i Timidity suporten SoundFont" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "Mode combinat AdLib/MIDI" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "Utilitza MIDI i la generaciѓ de so AdLib alhora" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "Guany MIDI:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "Configuraciѓ de FluidSynth" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "Disposit. MT-32:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Especifica el dispositiu de so per defecte per a la sortida de Roland MT-32/" "LAPC1/CM32l/CM64" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 real (desactiva l'emulaciѓ GM)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -897,189 +898,201 @@ msgstr "" "Marqueu si voleu utilitzar el vostre dispositiu hardware real de so " "compatible amb Roland connectat al vostre ordinador" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 real (sense emulaciѓ GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 #, fuzzy msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Mode Roland GS (desactiva el mapeig GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" msgstr "" -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "No utilitzis mњsica de Roland MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Text i Veus:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Veus" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Subtэtols" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Ambdѓs" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Velocitat de subt.:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text i Veus:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Veus" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Subt" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "Ambdѓs" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Mostra els subtэtols i reprodueix la veu" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Veloc. de subt.:" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Volum de mњsica:" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Volum de mњsica:" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Silenciar tot" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "Volum d'efectes:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Volum dels sons d'efectes especials" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "Volum d'efectes:" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Volum de veus:" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Volum de veus:" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Camэ dels temes:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Camэ temes:" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Especifica el camэ de les dades addicionals utilitzades per tots els jocs o " "pel ScummVM" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Camэ dels connectors:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Camэ de connectors:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Misc" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "Pintat GUI:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Desat automрtic:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Auto-desat:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Tecles" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "Idioma GUI:" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "Idioma de la interfэcie d'usuari de ScummVM" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Heu de reiniciar ScummVM perquш tots els canvis tinguin efecte." -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "" "No es pot escriure al directori seleccionat. Si us plau, escolliu-ne un " "altre." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Seleccioneu el directori dels temes" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Seleccioneu el directori dels fitxers extra" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Seleccioneu el directori dels connectors" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1259,39 +1272,60 @@ msgstr "Pintat amb antialias (16bpp)" msgid "Antialiased" msgstr "Amb antialias (16bpp)" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "" + +#: gui/updates-dialog.cpp:92 +#, fuzzy +msgid "Check for updates automatically" +msgstr "Comprova les actualitzacions..." + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Neteja el valor" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "El motor no suporta el nivell de depuraciѓ '%s'" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Menњ" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Salta" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pausa" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Salta la lэnia" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Error al executar el joc:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "No s'ha pogut trobar cap motor capaч d'executar el joc seleccionat" @@ -1386,6 +1420,23 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "" + +#: common/updates.cpp:64 +#, fuzzy +msgid "<Bad value>" +msgstr "Neteja el valor" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2324,7 +2375,7 @@ msgstr "" "No us oblideu d'assignar una tecla a l'acciѓ 'Ocultar la barra d'eines' per " "veure l'inventari complet" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "Comprova les actualitzacions..." @@ -2883,6 +2934,15 @@ msgstr "" "Utilitza el conjunt alternatiu de cursors platejats, en lloc dels normals " "daurats" +#: engines/scumm/detection.cpp:1335 +#, fuzzy +msgid "Show Object Line" +msgstr "Mostra les etiquetes dels objectes" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 05b5571c0c..3a72b20898 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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\n" "PO-Revision-Date: 2016-02-03 22:59+0100\n" "Last-Translator: Zbynьk Schwarz <zbynek.schwarz@gmail.com>\n" "Language-Team: \n" @@ -57,10 +57,11 @@ msgstr "Jэt nahoru" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -174,7 +175,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "Trojњhrlnэk" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Rљznщ" @@ -208,7 +209,7 @@ msgstr "Resetovat veЙkerс nastavenэ FludSynth n ajejich v§chozэ hodnoty." #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -243,15 +244,15 @@ msgstr "Zavјэt" msgid "Mouse click" msgstr "Kliknutэ myЙэ" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Zobrazit klсvesnici" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Pјemapovat klсvesy" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "Pјepnout celou obrazovku" @@ -325,8 +326,8 @@ msgid "" "English" msgstr "Jazyk hry. Toto z vaЙэ Љpanьlskщ verze neudьlс Anglickou" -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<v§chozэ>" @@ -348,11 +349,11 @@ msgstr "Platforma:" msgid "Engine" msgstr "Jсdro" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Obraz" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "GFX" @@ -365,7 +366,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Potlaшit globсlnэ nastavenэ obrazu" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Zvuk" @@ -378,11 +379,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Potlaшit globсlnэ nastavenэ zvuku" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Hlasitost" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "Hlasitost" @@ -396,7 +397,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Potlaшit globсlnэ nastavenэ hlasitosti" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -409,7 +410,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Potlaшit globсlnэ nastavenэ MIDI" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -422,11 +423,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Potlaшit globсlnэ nastavenэ MT-32" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Cesty" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Cesty" @@ -440,7 +441,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Cesta Hry:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Dodateшnс Cesta:" @@ -448,42 +449,42 @@ msgstr "Dodateшnс Cesta:" msgid "Specifies path to additional data used by the game" msgstr "Stanovэ cestu pro dodateшnс data pouОitс ve hјe" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Dodateшnс Cesta:" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Cesta pro uloОenэ:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Stanovuje, kam jsou umэstьny vaЙe uloОenщ hry" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Cesta pro uloОenэ:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Ўсdnщ" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "V§chozэ" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "Vybrat SoundFont" @@ -495,7 +496,7 @@ msgstr "Vyberte adresсј s daty hry" msgid "Select additional game directory" msgstr "Vyberte dodateшn§ adresсј hry" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Vyberte adresсј pro uloОenщ hry" @@ -689,132 +690,132 @@ msgstr "Pјepnout do hry" msgid "Fast replay" msgstr "Rychlщ pјehrсvсnэ" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Nikdy" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "KaОd§ch 5 min" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "KaОd§ch 10 min" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "KaОd§ch 15 min" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "KaОd§ch 30 min" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Ўсdnщ" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Nelze pouОэt nьkterщ zmьny moОnostэ grafiky:" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "reОim obrazu nemohl b§t zmьnьn." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "nastavenэ celщ obrazovky nemohlo b§t zmьnьno" -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "nastavenэ pomьru stran nemohlo b§t zmьnьno" -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "ReОim obrazu:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "ReОim vykreslenэ:" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Speciсlnэ reОimy chvьnэ podporovanщ nьkter§mi hrami" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "ReОim celщ obrazovky" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Korekce pomьru stran" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "Korigovat pomьr stran pro hry 320x200" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Prioritnэ Zaјэzenэ:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Hudebnэ zaјэzenэ" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "Stanovэ prioritnэ zvukovщ zaјэzenэ nebo emulсtor zvukovщ karty" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "Stanovэ v§stupnэ zvukovщ zaјэzenэ nebo emulсtor zvukovщ karty" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Prioritnэ Zaј.:" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Hudebnэ zaјэzenэ" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "AdLib emulсtor" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "AdLib se pouОэvс pro hudbu v mnoha hrсch" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "V§stup. frekvence:" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -822,66 +823,66 @@ msgstr "" "VyЙЙэ hodnota zpљsobэ lepЙэ kvalitu zvuku, ale nemusэ b§t podporovсna VaЙi " "zvukovou kartou" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "GM Zaјэzenэ:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "Stanovэ v§chozэ zvukovщ zaјэzenэ pro v§stup General MIDI" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "NepouОэvat hudbu General MIDI" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "PouОэt prvnэ dostupnщ zaјэzenэ" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "SoundFont je podporovсn nьkter§mi zvukov§mi kartami, FluidSynth a Timidity" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "SmэЙen§ reОim AdLib/MIDI" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "PouОэt obь zvukovщ generace MIDI a AdLib" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "Zesэlenэ MIDI:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "Nastavenэ FluidSynth" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "Zaјэzenэ MT-32:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Stanovэ v§chozэ zvukovщ v§stupnэ zaјэzenэ pro Roland MT-32/LAPC1/CM32l/CM64" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Opravdov§ Roland MT-32 (vypne GM emulaci)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -889,16 +890,16 @@ msgstr "" "ZaЙkrtnьte, pokud chcete pouОэt pravщ hardwarovщ zaјэzenэ kompatibilnэ s " "Roland, pјipojenщ k vaЙemu poшэtaшi" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Opravdov§ Roland MT-32 (Осdnс GM emulace)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Zaјэzenэ Roland GS (zapne mapovсnэ MT-32)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -906,169 +907,181 @@ msgstr "" "ZaЙkrtnьte, pokud chcete povolit zсplaty mapovсnэ umoОђujэcэ emulovat MT-32 " "na zaјэzenэ Roland GS" -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "NepouОэvat hudbu Roland MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Text a иeш" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "иeш" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Titulky" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Oba" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Rychlost titulkљ:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text a иeш:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "иeш" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Titl" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "Oba" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Zobrazit titulky a pјehrсvat јeш" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Rychlost titulkљ" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Hlasitost hudby" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Hlasitost hudby" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Ztlumit VЙe" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "Hlasitost zvukљ" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Hlasitost speciсlnэch zvukov§ch efektљ" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "Hlasitost zvukљ" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Hlasitost јeшi" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Hlasitost јeшi" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Cesta ke Vzhledu:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Cesta ke Vzhledu:" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "Stanovэ cestu k dodateшn§m datљm pouОэvanс vЙemi hrami nebo ScummVM" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Cesta k Pluginљm:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Cesta k Pluginљm:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Rљznщ" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Vzhled:" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "GUI Vykreslovaш:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Autouklсdсnэ:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Autouklсdсnэ:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Klсvesy" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "Jazyk GUI" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "Jazyk GUI ScummVM" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Pro pouОitэ tьchto nastavenэ musэte restartovat ScummVM." -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Do zvolenщho adresсјe nelze zapisovat. Vyberte, prosэm, jin§." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Vyberte adresсј pro vhledy GUI" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Vyberte adresсј pro dodateшnщ soubory" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Vyberte adresсј pro zсsuvnщ moduly" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1241,39 +1254,60 @@ msgstr "Vykreslovaш s vyhlazen§mi hranami" msgid "Antialiased" msgstr "S vyhlazen§mi hranami" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "" + +#: gui/updates-dialog.cpp:92 +#, fuzzy +msgid "Check for updates automatically" +msgstr "Zkontrolovat Aktualizace..." + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Vyшistit hodnotu" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Jсdro nepodporuje њroveђ ladьnэ '%s'" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Menu" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Pјeskoшit" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pauza" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Pјeskoшit јсdek" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Chyba pјi spuЙtьnэ hry:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "Nelze nalщzt Осdnщ jсdro schopnщ vybranou hru spustit" @@ -1368,6 +1402,23 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Jantarovс" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "" + +#: common/updates.cpp:64 +#, fuzzy +msgid "<Bad value>" +msgstr "Vyшistit hodnotu" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2304,7 +2355,7 @@ msgstr "" "Nezapomeђte namapovat klсvesu k шinnosti 'Skr§t Panel Nсstrojљ, abyste " "vidьli cel§ inventсј" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "Zkontrolovat Aktualizace..." @@ -2869,6 +2920,15 @@ 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" +#: engines/scumm/detection.cpp:1335 +#, fuzzy +msgid "Show Object Line" +msgstr "Zobrazit jmenovky objektљ" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/po/da_DK.po b/po/da_DK.po index 15cac81e94..69692f03bc 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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\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" @@ -55,10 +55,11 @@ msgstr "Gх op" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -172,7 +173,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "Triangulцr" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Andet" @@ -206,7 +207,7 @@ msgstr "Nulstil alle FluidSynth indstillinger til deres standard vцrdier." #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -241,15 +242,15 @@ msgstr "Luk" msgid "Mouse click" msgstr "Muse klik" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Vis tastatur" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Kortlцg taster" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "Skift fuldskцrm" @@ -325,8 +326,8 @@ msgstr "" "Spillets sprog. Dette vil ikke цndre din spanske version af spillet til " "engelsk" -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<standard>" @@ -348,11 +349,11 @@ msgstr "Platform:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Grafik" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "GFX" @@ -365,7 +366,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafik indstillinger" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Lyd" @@ -378,11 +379,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lyd indstillinger" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Lydstyrke" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "Lydstyrke" @@ -396,7 +397,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale lydstyrke indstillinger" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -409,7 +410,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI indstillinger" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -422,11 +423,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32 indstillinger" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Stier" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Stier" @@ -440,7 +441,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spil sti:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Ekstra sti:" @@ -448,42 +449,42 @@ msgstr "Ekstra sti:" msgid "Specifies path to additional data used by the game" msgstr "Angiver sti til ekstra data der bruges i spillet" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstra sti:" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Gemme sti:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Angiver hvor dine gemmer bliver lagt" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Gemme sti:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Ingen" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "Vцlg SoundFont" @@ -495,7 +496,7 @@ msgstr "Vцlg bibliotek med spil data" msgid "Select additional game directory" msgstr "Vцlg ekstra spil bibliotek" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Vцlg bibliotek til spil gemmer" @@ -690,132 +691,132 @@ msgstr "Skift til Spil" msgid "Fast replay" msgstr "Hurtig afspil" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Aldrig" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "hvert 5. minut" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "hvert 10. minut" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "hvert 15. minut" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "hvert 30. minut" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Anvendelse af цndringer for grafiske indstillinger fejlede:" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "videotilstanden kunne ikke цndres." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "fuld skцrm indstillingen kunne ikke цndres" -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "billedformat indstillingen ikke kunne цndres" -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Grafik tilstand:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Rendere tilstand:" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Speciel farvereduceringstilstand understјttet a nogle spil" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "Fuldskцrms tilstand" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Billedformat korrektion" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "Korrekt billedformat til 320x200 spil" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Foretruk. enhed:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Musik enhed:" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "Angiver foretukket lyd enhed eller lydkort emulator" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "Angiver lyd udgangsenhed eller lydkorts emulator" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Foretruk. enh.:" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Musik enhed:" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "AdLib emulator:" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "AdLib bliver brugt til musik i mange spil" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "Udgangsfrekvens:" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -823,64 +824,64 @@ msgstr "" "Hјjere vцrdi angiver bedre lyd kvalitet, men understјttes mхske ikke af dit " "lydkort" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "GM enhed:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "Angiver standard lyd enhed for Generel MIDI-udgang" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "Brug ikke Generel MIDI musik" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "Brug fјrste tilgцngelig enhed" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "SoundFont er understјttet af nogle lydkort, FluidSynth og Timidity" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "Blandet AdLib/MIDI tilstand" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "Brug bхde MIDI og AdLib lyd generering" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "MIDI lydstyrke:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "FluidSynth indstillinger" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "MT-32 enhed:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "Angiver standard lyd enhed for Roland MT-32/LAPC1/CM32I/CM64 udgang" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Цgte Roland MT-32 (undlad GM emulering)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -888,16 +889,16 @@ msgstr "" "Kryds af hvis du vil bruge din rigtige hardware Roland-kompatible lyd enhed " "tilsluttet til din computer" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Цgte Roland MT-32 (ingen GM emulering)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS enhed (aktivщr MT-32 tilknytninger)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -905,169 +906,181 @@ msgstr "" "Kryds af hvis du vil aktivere patch tilknytninger, for at emulere en MT-32 " "pх en Roland GS enhed" -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "Brug ikke Roland MT-32 musik" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Tekst og tale:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Undertekster" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Begge" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Tekst hastighed:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst og tale:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Tale" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Tekst" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "Begge" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Vis undertekster og afspil tale" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Tekst hastighed:" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Musik lydstyrke:" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Musik lydstyrke:" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Mute alle" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "SFX lydstyrke:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Lydstyrke for specielle lydeffekter" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX lydstyrke:" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Tale lydstyrke:" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Tale lydstyrke:" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Tema sti:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Tema sti:" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "Angiver sti til ekstra data brugt af alle spil eller ScummVM" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Plugin sti:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugin sti:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Andet" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "GUI renderer:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Auto gemme:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Auto gemme:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Taster" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "Sprog:" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "Sprog for brugerfladen i ScummVM" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Du skal genstarte ScummVM fјr dine цndringer har effekt." -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Der kan ikke skrives til det valgte bibliotek. Vцlg venligst et andet." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Vцlg bibliotek for GUI temaer" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Vцlg bibliotek for ekstra filer" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Vцlg bibliotek for plugins" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1240,39 +1253,60 @@ msgstr "Antialias renderer" msgid "Antialiased" msgstr "Antialias" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "" + +#: gui/updates-dialog.cpp:92 +#, fuzzy +msgid "Check for updates automatically" +msgstr "Sјg efter opdateringer..." + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Slet vцrdi" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Motor understјtter ikke fejlfindingsniveau '%s'" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Menu" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Spring over" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pause" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Spring linje over" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Fejl ved kјrsel af spil:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "Kunne ikke finde nogen motor istand til at afvikle det valgte spil" @@ -1367,6 +1401,23 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules brun" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "" + +#: common/updates.cpp:64 +#, fuzzy +msgid "<Bad value>" +msgstr "Slet vцrdi" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2303,7 +2354,7 @@ msgstr "" "Glem ikke at tildele en tast til 'Skjul vцrktјjslinje' handling for at se " "hele oversigten" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "Sјg efter opdateringer..." @@ -2872,6 +2923,15 @@ msgid "" msgstr "" "Brug det alternative sцt af sјlv markјrer, i stedet for de normale gyldne" +#: engines/scumm/detection.cpp:1335 +#, fuzzy +msgid "Show Object Line" +msgstr "Vis labels pх genstande" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/po/de_DE.po b/po/de_DE.po index 7dd4607077..2943f18bfa 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -1,23 +1,22 @@ # German translation for ScummVM. # Copyright (C) 2010-2016 The ScummVM Team # This file is distributed under the same license as the ScummVM package. -# Simon Sawatzki <SimSaw@gmx.de>, Lothar Serra Mari <scummvm@rootfather.de>, 2016. +# Simon Sawatzki <SimSaw@gmx.de>, Lothar Serra Mari <rootfather@scummvm.org>, 2016. # msgid "" msgstr "" -"Project-Id-Version: ScummVM 1.8.0git\n" +"Project-Id-Version: ScummVM 1.9.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\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" +"POT-Creation-Date: 2016-04-07 08:55+0100\n" +"PO-Revision-Date: 2016-04-15 11:00+0100\n" +"Last-Translator: Lothar Serra Mari <rootfather@scummvm.org>\n" "Language-Team: Simon Sawatzki <SimSaw@gmx.de>, Lothar Serra Mari " -"<scummvm@rootfather.de>\n" +"<rootfather@scummvm.org>\n" "Language: Deutsch\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Poedit 1.8.5\n" #: gui/about.cpp:94 #, c-format @@ -57,10 +56,11 @@ msgstr "Pfad hoch" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -174,7 +174,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "Dreieck" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Sonstiges" @@ -208,7 +208,7 @@ msgstr "Setzt alle FluidSynth-Einstellungen auf ihre Standard-Werte zurќck." #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -243,15 +243,15 @@ msgstr "Schlieпen" msgid "Mouse click" msgstr "Mausklick" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Tastatur anzeigen" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Tasten neu zuweisen" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "Vollbild umschalten" @@ -327,8 +327,8 @@ msgstr "" "Sprache des Spiels. Diese Funktion wird nicht eine spanische Version des " "Spiels in eine deutsche verwandeln." -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<Standard>" @@ -350,11 +350,11 @@ msgstr "Plattform:" msgid "Engine" msgstr "Engine" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Grafik" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "GFX" @@ -367,7 +367,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Globale Grafik-Einstellungen ќbergehen" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Audio" @@ -380,11 +380,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Globale Audio-Einstellungen ќbergehen" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Lautstфrke" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "Lautst." @@ -398,7 +398,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Globale Lautstфrke-Einstellungen ќbergehen" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -411,7 +411,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Globale MIDI-Einstellungen ќbergehen" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -424,11 +424,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Globale MT-32-Einstellungen ќbergehen" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Pfade" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Pfade" @@ -442,7 +442,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spielpfad:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Extras:" @@ -450,42 +450,42 @@ msgstr "Extras:" msgid "Specifies path to additional data used by the game" msgstr "Legt das Verzeichnis fќr zusфtzliche Spieldateien fest." -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Extras:" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Spielstфnde:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Legt fest, wo die Spielstфnde gespeichert werden." -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Spielstфnde:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Keiner" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "SoundFont auswфhlen" @@ -497,7 +497,7 @@ msgstr "Verzeichnis mit Spieldateien auswфhlen" msgid "Select additional game directory" msgstr "Verzeichnis mit zusфtzlichen Dateien auswфhlen" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Verzeichnis fќr Spielstфnde auswфhlen" @@ -694,135 +694,135 @@ msgstr "Wechsle" msgid "Fast replay" msgstr "Schneller Modus" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Niemals" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "alle 5 Minuten" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "alle 10 Minuten" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "alle 15 Minuten" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "alle 30 Minuten" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Kein SoundFont" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Folgende Grafikoptionen konnten nicht geфndert werden:" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "Grafikmodus konnte nicht geфndert werden." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "Vollbildeinstellung konnte nicht geфndert werden." -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "" "Einstellung fќr Seitenverhфltniskorrektur konnte nicht geфndert werden." -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Grafikmodus:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Render-Modus:" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "" "Spezielle Farbmischungsmethoden werden von manchen Spielen unterstќtzt." -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "Vollbildmodus" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Seitenverhфltnis korrigieren" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "Seitenverhфltnis fќr Spiele mit der Auflіsung 320x200 korrigieren" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Bevorzugtes Gerфt:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Musikgerфt:" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Legt das bevorzugte Tonwiedergabe-Gerфt oder den Soundkarten-Emulator fest." -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "Legt das Musikwiedergabe-Gerфt oder den Soundkarten-Emulator fest." -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Standard-Gerфt:" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Musikgerфt:" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "AdLib-Emulator" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "AdLib wird fќr die Musik in vielen Spielen verwendet." -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "Ausgabefrequenz:" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -830,68 +830,68 @@ msgstr "" "Hіhere Werte bewirken eine bessere Soundqualitфt, werden aber mіglicherweise " "nicht von jeder Soundkarte unterstќtzt." -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "GM-Gerфt:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "" "Legt das standardmфпige Musikwiedergabe-Gerфt fќr General-MIDI-Ausgabe fest." -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "Keine General-MIDI-Musik" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "Erstes verfќgbares Gerфt" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "SoundFont wird von einigen Soundkarten, FluidSynth und Timidity unterstќtzt." -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "Gemischter AdLib/MIDI-Modus" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "Kombiniert MIDI-Musik mit AdLib-Soundeffekten" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "MIDI-Lautstфrke:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "FluidSynth-Einstellungen" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "MT-32-Gerфt:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Legt das standardmфпige Tonwiedergabe-Gerфt fќr die Ausgabe von Roland MT-32/" "LAPC1/CM32l/CM64 fest." -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Echte Roland MT-32 (GM-Emulation deaktiviert)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -899,16 +899,16 @@ msgstr "" "Wфhlen Sie dies aus, wenn Sie ein echtes Roland-kompatibles Soundgerфt " "verwenden" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Echte Roland MT-32 (keine GM-Emulation)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland-GS-Gerфt (MT-32-Zuweisungen aktivieren)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -916,174 +916,186 @@ msgstr "" "Wфhlen Sie dies aus, wenn Sie ausbessernde Instrumentzuweisungen aktivieren " "mіchten, um MT-32 auf einem Roland-GS-Gerфt zu emulieren." -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "Keine Roland-MT-32-Musik" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Sprache und Text:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Sprache" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Untertitel" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Beides" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Untertitel-Tempo:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text u. Sprache:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Spr." -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Text" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "S+T" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Untertitel anzeigen und Sprachausgabe aktivieren" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Text-Tempo:" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Musiklautstфrke:" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Musiklautstфrke:" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Alles aus" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "Effektlautstфrke:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Lautstфrke spezieller Gerфusch-Effekte" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "Effektlautst.:" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Sprachlautstфrke:" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Sprachlautst.:" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Themen:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Themen:" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Legt das Verzeichnis fќr zusфtzliche Spieldateien fќr alle Spiele in ScummVM " "fest." -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Andere" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Thema:" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "GUI-Renderer:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Autom. Speichern:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Autospeichern:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Tasten" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "Sprache:" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "Sprache der ScummVM-Oberflфche" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "Updates suchen:" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "Wie oft nach Aktualisierungen von ScummVM suchen?" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "Jetzt prќfen" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Sie mќssen ScummVM neu starten, damit die Фnderungen wirksam werden." -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "" "In das gewфhlte Verzeichnis kann nicht geschrieben werden. Bitte ein anderes " "auswфhlen." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Verzeichnis fќr Oberflфchen-Themen" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Verzeichnis fќr zusфtzliche Dateien auswфhlen" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Verzeichnis fќr Erweiterungen auswфhlen" # Nicht ќbersetzen, da diese Nachricht nur fќr nicht-lateinische Sprachen relevant ist. -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1257,39 +1269,63 @@ msgstr "Kantenglфttung" msgid "Antialiased" msgstr "Kantenglфttung" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" +"ScummVM unterstќtzt die automatische Suche nach Aktualisierungen,\n" +"wozu ein Internetzugang erforderlich ist.\n" +"\n" +"Mіchten Sie diese Funktion aktivieren?" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "(Sie kіnnen diese auch jederzeit im Options-Dialog unter dem Reiter \"Sonstiges\" aktivieren)" + +#: gui/updates-dialog.cpp:92 +msgid "Check for updates automatically" +msgstr "Automatisch nach Aktualisierungen suchen" + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "Fortfahren" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Wert lіschen" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Engine unterstќtzt den Debug-Level \"%s\" nicht." -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Menќ" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "мberspringen" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pause" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Zeile ќberspringen" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Fehler beim Ausfќhren des Spiels:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "Konnte keine Spiel-Engine finden, die dieses Spiel starten kann." @@ -1384,6 +1420,22 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Bernst." +#: common/updates.cpp:58 +msgid "Daily" +msgstr "tфglich" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "wіchentlich" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "monatlich" + +#: common/updates.cpp:64 +msgid "<Bad value>" +msgstr "<Fehlerhafter Wert>" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2327,7 +2379,7 @@ msgstr "" "Vergessen Sie nicht, der Aktion \"Werkzeugleiste verbergen\" eine Taste " "zuzuweisen, um das ganze Inventar sehen zu kіnnen." -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "Suche nach Aktualisierungen..." @@ -2690,7 +2742,9 @@ 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." +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:96 engines/mohawk/dialogs.cpp:239 @@ -2907,6 +2961,14 @@ msgstr "" "Verwendet alternativen Satz silberner Mauszeiger anstatt der normalen " "goldenen." +#: engines/scumm/detection.cpp:1335 +msgid "Show Object Line" +msgstr "Objektzeile zeigen" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "Objektnamen und Verben am unteren Bildrand anzeigen" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/po/es_ES.po b/po/es_ES.po index 2a3b08e57d..784132da56 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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\n" "PO-Revision-Date: 2016-02-24 18:01+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -54,10 +54,11 @@ msgstr "Arriba" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -171,7 +172,7 @@ msgstr "Seno" msgid "Triangle" msgstr "Triсngulo" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Otras" @@ -205,7 +206,7 @@ msgstr "Volver a los valores por defecto de las opciones de FluidSynth" #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -240,15 +241,15 @@ msgstr "Cerrar" msgid "Mouse click" msgstr "Clic de ratѓn" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Mostrar el teclado" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Asignar teclas" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "Activar/Desactivar pantalla completa" @@ -324,8 +325,8 @@ msgstr "" "Idioma del juego. No sirve para pasar al inglщs la versiѓn espaёola de un " "juego" -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<por defecto>" @@ -347,11 +348,11 @@ msgstr "Plat.:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Grсficos" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "Grсf." @@ -364,7 +365,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Opciones grсficas especэficas" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Sonido" @@ -377,11 +378,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Opciones de sonido especэficas" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Volumen" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "Volumen" @@ -395,7 +396,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Opciones de volumen especэficas" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -408,7 +409,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Opciones de MIDI especэficas" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -421,11 +422,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Opciones de MT-32 especэficas" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Rutas" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Rutas" @@ -439,7 +440,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Juego:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Adicional:" @@ -447,42 +448,42 @@ msgstr "Adicional:" msgid "Specifies path to additional data used by the game" msgstr "Especifica un directorio para datos adicionales del juego" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Adicional:" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Partidas:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Especifica dѓnde guardar tus partidas" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Partidas:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Ninguna" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Por defecto" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "Selecciona un SoundFont" @@ -494,7 +495,7 @@ msgstr "Selecciona el directorio del juego" msgid "Select additional game directory" msgstr "Selecciona el directorio adicional" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Selecciona el directorio para partidas guardadas" @@ -689,135 +690,135 @@ msgstr "Volver al juego" msgid "Fast replay" msgstr "Repeticiѓn rсpida" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Nunca" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "cada 5 minutos" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "cada 10 minutos" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "cada 15 minutos" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "cada 30 minutos" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Ninguno" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Fallo al aplicar algunos cambios en las opciones grсficas:" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "no se ha podido cambiar el modo de vэdeo." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "no se ha podido cambiar el ajuste de pantalla completa" -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "no se ha podido cambiar el ajuste de correcciѓn de aspecto" -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Modo grсfico:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Renderizado:" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Modos especiales de difuminado compatibles con algunos juegos" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "Pantalla completa" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Correcciѓn de aspecto" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "Corregir relaciѓn de aspecto en juegos 320x200" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Disp. preferido:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Especifica quщ dispositivo de sonido o emulador de tarjeta de sonido " "prefieres" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "" "Especifica el dispositivo de sonido o emulador de tarjeta de sonido de salida" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferido:" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "Emul. de AdLib:" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "AdLib se usa para la mњsica en muchos juegos" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "Frec. de salida:" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -825,68 +826,68 @@ msgstr "" "Los valores mсs altos ofrecen mayor calidad, pero puede que tu tarjeta de " "sonido no sea compatible" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "Dispositivo GM:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "Especifica el dispositivo de salida General MIDI por defecto" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "No usar mњsica General MIDI" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "Utilizar el primer dispositivo disponible" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "SoundFont es compatible con algunas tarjetas de sonido, con FluidSynth y con " "Timidity" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "Modo AdLib/MIDI" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "Usar tanto MIDI como AdLib en la generaciѓn de sonido" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "Ganancia MIDI:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "Opciones de FluidSynth" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "Disp. MT-32:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Especifica el dispositivo de sonido para la salida Roland MT-32/LAPC1/CM32l/" "CM64 por defecto" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 autщntica (desactivar emulaciѓn GM)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -894,16 +895,16 @@ msgstr "" "Marcar si se quiere usar un dispositivo de sonido real conectado al " "ordenador y compatible con Roland" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 real (sin emulaciѓn GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Dispositivo Roland GS (activar conversiѓn MT-32)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -911,170 +912,182 @@ msgstr "" "Marca esta opciѓn si quieres activar la conversiѓn para emular una MT-32 en " "un dispositivo Roland GS" -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "No usar mњsica Roland MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Texto y voces:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Voces" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Subtэtulos" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Ambos" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Vel. de subtэtulos:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Texto y voces:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Voz" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Subt" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "V&S" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Reproducir voces y subtэtulos" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Vel. de subt.:" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Mњsica:" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Mњsica:" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Silenciar" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "Efectos:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Volumen de los efectos de sonido" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "Efectos:" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Voces:" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Voces:" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Temas:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Temas:" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "Especifica el directorio adicional usado por los juegos y ScummVM" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Otras" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "Interfaz:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Autoguardado:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Autoguardado:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Teclas" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "Idioma:" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "Idioma de la interfaz de ScummVM" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Tienes que reiniciar ScummVM para aplicar los cambios." -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "" "No se puede escribir en el directorio elegido. Por favor, selecciona otro." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Selecciona el directorio de temas" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Selecciona el directorio adicional" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Selecciona el directorio de plugins" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1247,39 +1260,60 @@ msgstr "Suavizado" msgid "Antialiased" msgstr "Suavizado" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "" + +#: gui/updates-dialog.cpp:92 +#, fuzzy +msgid "Check for updates automatically" +msgstr "Buscar actualizaciones..." + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Eliminar valor" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "El motor no es compatible con el nivel de debug '%s'" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Menњ" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Saltar" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pausar" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Saltar frase" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Error al ejecutar el juego:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "No se ha podido encontrar ningњn motor capaz de ejecutar el juego" @@ -1374,6 +1408,23 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules сmbar" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "" + +#: common/updates.cpp:64 +#, fuzzy +msgid "<Bad value>" +msgstr "Eliminar valor" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2311,7 +2362,7 @@ msgstr "" "No olvides asignar una tecla a la acciѓn 'Ocultar barra de tareas' para ver " "todo el inventario" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "Buscar actualizaciones..." @@ -2882,6 +2933,15 @@ msgid "" msgstr "" "Usar los cursores plateados alternativos, en vez de los dorados normales" +#: engines/scumm/detection.cpp:1335 +#, fuzzy +msgid "Show Object Line" +msgstr "Mostrar etiquetas de objetos" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." @@ -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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\n" "PO-Revision-Date: 2011-12-15 14:53+0100\n" "Last-Translator: Mikel Iturbe Urretxa <mikel@hamahiru.org>\n" "Language-Team: Librezale <librezale@librezale.org>\n" @@ -53,10 +53,11 @@ msgstr "Joan gora" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -170,7 +171,7 @@ msgstr "Sinua" msgid "Triangle" msgstr "Triangelua" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Beste" @@ -204,7 +205,7 @@ msgstr "Berrazarri FluidSynth-en ezarpen guztiak bere balio lehenetsietara" #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -237,15 +238,15 @@ msgstr "Itxi" msgid "Mouse click" msgstr "Sagu-klika" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Erakutsi teklatua" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Esleitu teklak" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "Txandakatu pantaila osoa" @@ -320,8 +321,8 @@ msgid "" msgstr "" "Jokoaren hizkuntza. Honek ez du zure ingelesezko bertsioa frantsesera pasako" -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<lehenetsia>" @@ -343,11 +344,11 @@ msgstr "Plataforma:" msgid "Engine" msgstr "Motorea" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Grafikoak" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "GFX" @@ -360,7 +361,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Ezarpen grafiko globalak baliogabetu" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Soinua" @@ -373,11 +374,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Soinu ezarpen globalak baliogabetu" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Bolumena" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "Bolumena" @@ -391,7 +392,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Bolumen ezarpen globalak baliogabetu" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -404,7 +405,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "MIDI ezarpen globalak baliogabetu" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -417,11 +418,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "MT-32 ezarpen globalak baliogabetu" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Bide-izenak" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Bideak" @@ -435,7 +436,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Jokoa:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Gehigarriak:" @@ -443,42 +444,42 @@ msgstr "Gehigarriak:" msgid "Specifies path to additional data used by the game" msgstr "Jokoak erabiltzen duen datu gehigarrien bide-izena" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Gehigarria:" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Partida gordeak:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Zure gordetako partidak non gordeko diren zehazten du" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Partida gordeak:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Bat ere ez" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Lehenetsia" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "SoundFont-a aukeratu" @@ -490,7 +491,7 @@ msgstr "Jokoaren direktorioa aukeratu" msgid "Select additional game directory" msgstr "Direktorio gehigarria aukeratu" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Partida gordeen direktorioa aukeratu" @@ -688,132 +689,132 @@ msgstr "Aldatu jokora" msgid "Fast replay" msgstr "Errepikappen bizkorra" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Inoiz ez" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "5 minuturo" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "10 minuturo" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "15 minuturo" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "30 minuturo" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Bat ere ez" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Ezin izan da grafikoen aukeretako batzuk aplikatu:" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "ezin izan da bideo-modua aldatu." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "ezin izan da pantaila-osoaren ezarpena aldatu" -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "formatu-ratioaren ezarpena ezin izan da aldatu" -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Modu grafikoa:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Renderizazioa:" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Joko batzuk onarturiko lausotze-modu bereziak" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "Pantaila osoa" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Formatu-ratioaren zuzenketa" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "320x200 jokoentzako formatu-ratioa zuzendu" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Gogoko gailua:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Musika gailua:" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "Gogoko soinu txartel edo emuladorea zein den ezartzen du" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "Irteerako soinu txartel edo emuladorea ezartzen du" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Gail. gogokoa:" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Musika gailua:" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "AdLib emuladorea:" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "AdLib musikarako hainbat jokotan erabiltzen da" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "Irteera maizt.:" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -821,68 +822,68 @@ msgstr "" "Balio altuagoek soinu kalitate hobea ezartzen dute, baina baliteke zure " "soinu-txartela bateragarria ez izatea" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "GM gailua:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "Defektuzko soinu txartela ezartzen du General MIDI irteerarako" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "Ez erabili General MIDI musika" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "Erabilgarri dagoen lehen gailua erabili" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "Zenbait soinu txartel bateragarriak dira SoundFont-ekin, FluidSynth eta " "Timidity besteak beste" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "AdLib/MIDI modua" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "Soinua sortzerakoan MIDI eta AdLib erabili" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "MIDI irabazia:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "FluidSynth Ezarpenak" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "MT-32 gailua:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Roland MT-32/LAPC1/CM32l/CM64 irteerarako defektuzko soinu txartela ezartzen " "du" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Benetako Roland MT-32 (GM emulazio gabe)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -890,16 +891,16 @@ msgstr "" "Markatu ordenagailura konektaturiko Roland-ekin bateragarria den soinu-" "gailua erabiltzeko" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Benetako Roland MT-32 (GM emulazio gabe)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS Gailua (gaitu MT-32 bihurketak)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -907,170 +908,182 @@ msgstr "" "Markatu Roland GS gailu batean MT-32 bat emulatzea ahalbidetzen " "dutenbihurketak gaitzeko" -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "Ez erabili Roland MT-32 musika" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Testu eta ahotsa:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Ahotsa" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Azpitituluak" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Biak" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Azpitit. abiadura:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Testu eta ahotsa:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Ahots." -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Azp." -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "Biak" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Ahotsak erreproduzitu eta azpitituluak erakutsi" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Azpit. abiadura:" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Musika:" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Musika:" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Mututu dena" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "Efektuak:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Soinu efektu berezien bolumena" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "Efektuak:" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Ahotsak:" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Ahotsak:" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Gaiak:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Gaiak:" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Joko guztiek edo ScummVM-k darabilten datu gehigarrien bide-izena ezartzen du" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Pluginak:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginak:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Beste" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Gaia:" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "Interfazea:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Autogordetzea:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Autogordetzea:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Teklak" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "Hizkuntza" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "ScummVM interfazearen hizkuntza" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "ScummVM berrabiarazi behar duzu aldaketak indarrean jartzeko" -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Aukeraturiko direktorioan ezin da idatzi. Mesedez, aukeratu beste bat." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Gaien direktorioa aukeratu" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Fitxategi gehigarrien direktorioa aukeratu" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Pluginen direktorioa aukeratu" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1243,39 +1256,60 @@ msgstr "Errendatzaile lausotua" msgid "Antialiased" msgstr "Lausotua" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "" + +#: gui/updates-dialog.cpp:92 +#, fuzzy +msgid "Check for updates automatically" +msgstr "Eguneraketak bilatzen..." + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Balioa kendu:" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Motoreak ez da '%s' debug mailarekin bateragarria" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Menua" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Saltatu" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Gelditu" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Lerroa saltatu" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Jokoa exekutatzean errorea:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "Ezin izan da aukeraturiko jokoa exekutatzeko gai den motorerik aurkitu" @@ -1370,6 +1404,23 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Herkules anbar-kolorekoa" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "" + +#: common/updates.cpp:64 +#, fuzzy +msgid "<Bad value>" +msgstr "Balioa kendu:" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2304,7 +2355,7 @@ msgstr "" "Ez ahaztu 'tresna-barra ezkutatu' ekintza tekla bati esleitzea inbentario " "osoa ikusteko" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "Eguneraketak bilatzen..." @@ -2875,6 +2926,15 @@ msgstr "" "Erabili zilar kolorezko kurtsore multzo alternatiboa, urre-koloreko " "kursorenormalak erabili beharrean" +#: engines/scumm/detection.cpp:1335 +#, fuzzy +msgid "Show Object Line" +msgstr "Erakutsi objektuen etiketak" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/po/fi_FI.po b/po/fi_FI.po index 858e15a587..bc0e1a269b 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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\n" "PO-Revision-Date: 2012-12-01 19:37+0200\n" "Last-Translator: Toni Saarela <saarela@gmail.com>\n" "Language-Team: Finnish\n" @@ -55,10 +55,11 @@ msgstr "Siirry ylіs" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -176,7 +177,7 @@ msgstr "" msgid "Triangle" msgstr "" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Muut" @@ -210,7 +211,7 @@ msgstr "" #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -244,15 +245,15 @@ msgstr "Sulje" msgid "Mouse click" msgstr "Hiiren klikkaus" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Nфytф nфppфimistі" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Mффritф nфppфimet uudelleen" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "Kokoruututilan vaihto" @@ -328,8 +329,8 @@ msgstr "" "Pelin kieli. Tфmф ei muuta esimerkiksi espanjankielistф versiota pelistф " "englanninkieliseksi." -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<oletus>" @@ -351,11 +352,11 @@ msgstr "Alusta:" msgid "Engine" msgstr "Moottori" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Grafiikka" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "GFX" @@ -368,7 +369,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Ohita globaalit grafiikka-asetukset" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Ффni" @@ -381,11 +382,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Ohita globaalit ффniasetukset" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Voimakkuus" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "Voimakkuus" @@ -399,7 +400,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Ohita globaalit ффnenvoimakkuusasetukset" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -412,7 +413,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Ohita globaalit MIDI-asetukset" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -425,11 +426,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Ohita globaalit MT-32 asetukset" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Polut" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Polut" @@ -443,7 +444,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Pelin polku:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Lisфkansio:" @@ -451,42 +452,42 @@ msgstr "Lisфkansio:" msgid "Specifies path to additional data used by the game" msgstr "Mффrittфф polun lisфtiedostoihin joita peli mahdollisesti kфyttфф" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Lisфkansio:" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Tallennuskansio:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Mффrittфф polun pelitallennuksille" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Tallennuskansio:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Ei mффritelty" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Oletus" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "Valitse ффnifontti" @@ -498,7 +499,7 @@ msgstr "Valitse pelin kansio" msgid "Select additional game directory" msgstr "Valitse lisфkansio pelille" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Valitse kansio pelitallennuksille" @@ -699,134 +700,134 @@ msgstr "Vaihda" msgid "Fast replay" msgstr "Nopea moodi" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Ei koskaan" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "5 minuutin vфlein" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "10 minuutin vфlein" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "15 minuutin vфlein" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "30 minuutin vфlein" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Ei kфytіssф" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Joitain grafiikka-asetuksia ei saatu asetettua:" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "videotilaa ei voitu vaihtaa." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "kokoruututilaa ei voitu muuttaa" -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "kuvasuhdekorjausasetusta ei voitu muuttaa" -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Grafiikkatila:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Renderіintitila:" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Erityiset dithering asetukset joita jotkut pelit tukevat" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "Kokoruututila" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Kuvasuhteen korjaus" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "Oikea kuvasuhde 320x200 peleille" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Ensisijainen laite:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Musiikkilaite:" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Mффrittфф ффnilaitteen tai ффnikorttiemulaattorin jota ensisijaisesti tulisi " "kфyttфф" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "Mффrittфф ффnikortin tai ффnikorttia emuloivan ohjelmiston" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Ensisijainen:" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Musiikkilaite:" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "AdLib emulaattori:" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "AdLibiф kфytetффn monien pelien musiikeissa" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "Taajuus:" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -834,65 +835,65 @@ msgstr "" "Isommat taajuudet merkitsevфt parempaa ффnenlaatua, mutta ффnikorttisi ei " "ehkф tue niitф." -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "GM laite:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "Mффrittфф oletuksena kфytettфvфn ффnilaitteen General MIDIlle" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "Фlф kфytф General MIDIф musiikissa" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "Kфytф ensimmфistф laitetta" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "Ффnifontti:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "Jotkut ффnikortit tukevat ффnifonttia (SoundFont), FluidSynth ja Timidity" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "Ффnifontti:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "Yhdistetty AdLib/MIDI tila" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "Kфytф sekф MIDIф ettф Adlibiф ффnentuotantoon" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "MIDIn ффnilisфys:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "MT-32 laite:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "Mффrittфф oletusффnilaitteen Roland MT-32/LAPC1/CM32l/CM64:n kфyttііn" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Aito Roland MT-32 (ei GM emulointia)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -900,187 +901,199 @@ msgstr "" "Valitse jos haluat kфyttфф aitoa Roland-yhteensopivaa laittetta joka on " "kytketty tietokoneeseesi" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Aito Roland MT-32 (ei GM emulointia)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 #, fuzzy msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Aito Roland MT-32 (ei GM emulointia)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" msgstr "" -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "Фlф kфytф Roland MT-32 musiikkia" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Tekstitys ja puhe:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Puhe" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Tekstitys" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Molemmat" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Tekstin nopeus:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekstitys ja puhe:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Puhe" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Tekstit" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "Molemmat" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Nфytф tekstitys ja kфytф puhetta" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Tekstin nopeus:" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Musiikki:" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Musiikki:" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Vaimenna" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "Ффniefektit:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Erikoisefektit" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "Ффniefektit:" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Puhe:" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Puhe:" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Teemojen polku:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Teemojen polku:" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Mффrittфф polun, jossa on lisфtiedostoja joita ScummVM tai kaikki pelit " "kфyttфvфt" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Pluginien sijainti:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginien sijainti:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Muut" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Teema" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "GUI renderіijф:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Autom. tallennus:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Autom. tallennus:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Nфppфimet" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "ScummVM:n kieli:" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "ScummVM kфyttіliittymфn kieli" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "ScummVM pitфф kфynnistфф uudelleen jotta muutokset tulevat voimaan." -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Valittuun hakemistoon ei voi kirjoittaa. Valitse toinen hakemisto." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Valitse hakemisto kфyttіliittymфn teemoille" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Valitse hakemisto lisфtiedostoille" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Valitse hakemisto plugineille" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1260,39 +1273,60 @@ msgstr "Antialiasoitu renderіijф (16 bpp)" msgid "Antialiased" msgstr "Antialiasoitu (16 bpp)" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "" + +#: gui/updates-dialog.cpp:92 +#, fuzzy +msgid "Check for updates automatically" +msgstr "Tarkista pфivitykset..." + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Tyhjennф arvo" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Pelimoottori ei tue debug tasoa '%s'" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Valikko" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Ohita" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Tauko" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Ohita rivi" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Virhe ajettaessa peliф:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "Pelimoottoria joka tukisi valittua peliф ei lіytynyt" @@ -1387,6 +1421,23 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "" + +#: common/updates.cpp:64 +#, fuzzy +msgid "<Bad value>" +msgstr "Tyhjennф arvo" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2329,7 +2380,7 @@ msgstr "" "Muista mффritellф nфppфin tyіkalupalkin piilottamiselle, jotta voit nфhdф " "koko tavaraluettelon" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "Tarkista pфivitykset..." @@ -2880,6 +2931,15 @@ msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "Kфytф vaihtoehtoisia hopeisia kursoreita normaalien kultaisten sijaan" +#: engines/scumm/detection.cpp:1335 +#, fuzzy +msgid "Show Object Line" +msgstr "Nфytф esineiden tiedot" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/po/fr_FR.po b/po/fr_FR.po index 7a0ee5ea23..05ac39d23d 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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\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" @@ -55,10 +55,11 @@ msgstr "Remonter" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -172,7 +173,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "Triangle" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Divers" @@ -206,7 +207,7 @@ msgstr "Remet tous les rщglages р leurs valeurs par dщfaut." #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -240,15 +241,15 @@ msgstr "Fermer" msgid "Mouse click" msgstr "Clic de souris" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Afficher le clavier" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Changer l'affectation des touches" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "Basculer en plein щcran" @@ -324,8 +325,8 @@ msgstr "" "Langue du jeu. Cela ne traduira pas en anglais par magie votre version " "espagnole du jeu." -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<defaut>" @@ -347,11 +348,11 @@ msgstr "Systшme :" msgid "Engine" msgstr "Moteur" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Graphique" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "GFX" @@ -364,7 +365,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Audio" @@ -377,11 +378,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -395,7 +396,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -408,7 +409,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -421,11 +422,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Rщglages spщcifiques р ce jeux" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Chemins" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Chemins" @@ -439,7 +440,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Chemin du Jeu :" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Extra :" @@ -447,42 +448,42 @@ msgstr "Extra :" msgid "Specifies path to additional data used by the game" msgstr "Dщfinie un chemin vers des donnщes suplщmentaires utilisщes par le jeu" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Extra :" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Sauvegardes :" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Dщfinie l'emplacement oљ les fichiers de sauvegarde sont crщщs" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Sauvegardes :" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Aucun" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Dщfaut" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "Choisir une banque de sons" @@ -494,7 +495,7 @@ msgstr "Sщlectionner le rщpertoire contenant les donnщes du jeu" msgid "Select additional game directory" msgstr "Sщlectionner un rщpertoire supplщmentaire" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Sщlectionner le rщpertoire pour les sauvegardes" @@ -691,134 +692,134 @@ msgstr "Retourner au jeu" msgid "Fast replay" msgstr "Rejouer rapidement" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Jamais" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "Toutes les 5 mins" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "Toutes les 10 mins" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "Toutes les 15 mins" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "Toutes les 30 mins" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Aucune" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Certaines options graphiques n'ont pu ъtre changщes :" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "le mode vidщo n'a pu ъtre changщ." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "le mode plein щcran n'a pu ъtre changщ." -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "la correction de rapport d'aspect n'a pu ъtre changщe." -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Mode graphique :" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Mode de rendu :" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Mode spщcial de tramage supportщ par certains jeux" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "Plein щcran" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Correction du rapport d'aspect" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "Corrige le rapport d'aspect pour les jeu 320x200" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Sortie Prщfщrщ :" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Sortie Audio :" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Spщcifie le pщriphщrique de sortie audio ou l'щmulateur de carte audio " "prщfщrщ" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "Spщcifie le pщriphщrique de sortie audio ou l'щmulateur de carte audio" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Sortie Prщfщrщ :" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Sortie Audio :" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "Щmulateur AdLib :" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "AdLib est utilisщ pour la musique dans de nombreux jeux" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "Frщquence :" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -826,68 +827,68 @@ msgstr "" "Une valeur plus щlevщe donne une meilleure qualitщ audio mais peut ne pas " "ъtre supportщ par votre carte son" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "Sortie GM :" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "Spщcifie le pщriphщrique audio par dщfaut pour la sortie General MIDI" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "Ne pas utiliser la musique General MIDI" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "Utiliser le premier pщriphщrique disponible" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "Banque de sons :" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "La banque de sons (SoundFont) est utilisщe par certaines cartes audio, " "FluidSynth et Timidity" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont :" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "Mode mixe AdLib/MIDI" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "Utiliser р la fois MIDI et AdLib" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "Gain MIDI :" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "Paramшtres FluidSynth" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "Sortie MT-32 :" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Spщcifie le pщriphщrique audio par dщfaut pour la sortie Roland MT-32/LAPC1/" "CM32l/CM64" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 exacte (dщsactive l'щmulation GM)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -895,16 +896,16 @@ msgstr "" "Vщrifie si vous voulez utiliser un pщriphщrique audio compatible Roland " "connectщ р l'ordinateur" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 exacte (pas d'щmu GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS (active le mappage MT-32)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -912,174 +913,186 @@ msgstr "" "Utilisez cette option si vous voulez activez le mappage р la volщe pour une " "щmulation MT-32 sur un appareil Roland GS." -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "Ne pas utiliser la musique Roland MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Dialogue :" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Voix" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Sous-titres" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Les deux" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Vitesse des ST :" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Dialogue :" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Voix" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Subs" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "V&S" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Affiche les sous-titres et joue les dialogues audio" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Vitesse des ST :" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Volume Musique :" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Musique :" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Silence" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "Volume Bruitage :" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Volume des effets spщciaux sonores" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "Bruitage :" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Volume Dialogues :" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Dialogues :" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Thшmes :" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Thшmes :" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Spщcifie un chemin vers des donnщes supplщmentaires utilisщes par tous les " "jeux ou ScummVM" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Plugins :" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugins :" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Divers" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Thшme :" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "Interface :" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Sauvegarde auto :" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Sauvegarde :" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Touches" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "Langue :" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "Langue de l'interface graphique de ScummVM" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "Vщrif. mises р jour :" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "Frщquence des vщrifications" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "Maintenant" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "" "Vous devez relancer ScummVM pour que le changement soit pris en compte." -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "" "Le rщpertoire sщlectionnщ est vщrouillщ en щcriture. Sщlectionnez un autre " "rщpertoire." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Sщlectionner le rщpertoire des thшmes d'interface" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Sщlectionner le rщpertoire pour les fichiers suplщmentaires" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Sщlectionner le rщpertoire des plugins" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1252,39 +1265,65 @@ msgstr "Rendu Anti-crщnelщ" msgid "Antialiased" msgstr "Anti-crщnelщ" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" +"ScummVM peut maintenant rechercher les mises р jour\n" +"automatiquement, ce qui necessite un accшs internet.\n" +"\n" +"Voulez-vous activer cette options?" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "" +"(Vous pouvez aussi activer cette option dans le tab 'Divers'\n" +"du dialogue d'options)" + +#: gui/updates-dialog.cpp:92 +msgid "Check for updates automatically" +msgstr "Vщrifier les mises р jour automatiquement" + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "Appliquer" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Effacer la valeur" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Le niveau de debug '%s' n'est pas supportщ par ce moteur de jeu" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Menu" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Passer" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Mettre en pause" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Passer la phrase" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Erreur lors de l'щxщcution du jeu : " -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "Impossible de trouver un moteur pour exщcuter le jeu sщlectionnщ" @@ -1379,6 +1418,22 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Ambre" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "Une fois par jour" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "Une fois pas semaine" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "Une fois pas mois" + +#: common/updates.cpp:64 +msgid "<Bad value>" +msgstr "<Valeur invalide>" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2317,7 +2372,7 @@ msgstr "" "Noubliez pas d'affecter une touche р l'action 'Cacher Bar d'Outils' pour " "pouvoir voir entiшrement l'inventaire" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "Recherche des mises р jour..." @@ -2366,7 +2421,8 @@ 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." +msgstr "" +"Utilise les polices Hercules haute rщsolution quand elles sont disponibles." #: engines/agi/detection.cpp:187 msgid "Pause when entering commands" @@ -2377,8 +2433,8 @@ 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." +"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 @@ -2890,6 +2946,14 @@ 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" +#: engines/scumm/detection.cpp:1335 +msgid "Show Object Line" +msgstr "Afficher la barre d'objets" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "Afficher le nom des objets en bas de l'щcran" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/po/gl_ES.po b/po/gl_ES.po index c5c9bcf3b5..1b2731dc5e 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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\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" @@ -54,10 +54,11 @@ msgstr "Arriba" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -171,7 +172,7 @@ msgstr "Seno" msgid "Triangle" msgstr "Triсngulo" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Misc." @@ -206,7 +207,7 @@ msgstr "" #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -241,15 +242,15 @@ msgstr "Pechar" msgid "Mouse click" msgstr "Premer co rato" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Mostrar teclado" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Asignar teclas" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "Activar/desactivar pantalla completa" @@ -323,8 +324,8 @@ msgid "" "English" msgstr "Idioma do xogo. Non converterс a versiѓn galega do xogo en inglesa" -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<por defecto>" @@ -346,11 +347,11 @@ msgstr "Plataforma:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Grсficos" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "Efectos grсficos" @@ -363,7 +364,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Anular a configuraciѓn dos grсficos" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Son" @@ -376,11 +377,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Anular a configuraciѓn do son" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -394,7 +395,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Anular a configuraciѓn do volume" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -407,7 +408,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Anular a configuraciѓn de MIDI" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -420,11 +421,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Anular a configuraciѓn de MT-32" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Camiёos" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Camiёos" @@ -438,7 +439,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Camiёo do xogo:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Camiёo adicional:" @@ -446,42 +447,42 @@ msgstr "Camiёo adicional:" msgid "Specifies path to additional data used by the game" msgstr "Especifica o camiёo dos datos adicionais usados no xogo" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Camiёo adicional:" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Camiёo de gardado:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Especifica o lugar dos ficheiros de gardado" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Camiёo de gardado:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Ningњn" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Predefinido" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "Seleccionar SoundFont" @@ -493,7 +494,7 @@ msgstr "Selecciona un directorio con datos de xogo" msgid "Select additional game directory" msgstr "Selecciona un directorio con datos adicionais" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Selecciona un directorio para ficheiros de gardado" @@ -687,132 +688,132 @@ msgstr "Cambiar ao xogo" msgid "Fast replay" msgstr "Repeticiѓn rсpida" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Nunca" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "cada 5 min" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "cada 10 min" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "cada 15 min" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "cada 30 min" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Ningunha" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Erro ao aplicar os cambios na configuraciѓn dos grсficos:" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "non se puido cambiar o modo de vэdeo." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "non se puido cambiar a configuraciѓn de pantalla completa." -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "non se puido cambiar a proporciѓn." -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Grсficos:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Procesamento:" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Modos de interpolaciѓn de cores compatibles con algњns xogos" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "Pantalla completa" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Correcciѓn de proporciѓn" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "Corrixir a proporciѓn para os xogos en 320x200" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Dispositivo preferido:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Dispositivo de mњsica:" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "Especifica o dispositivo ou emulador de tarxeta de son preferido" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "Especifica o dispositivo ou emulador de tarxeta de son de saэda" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferido:" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Disp. mњsica:" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "Emulador de AdLib:" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "Moitos xogos empregan AdLib para a mњsica" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "Taxa de saэda:" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -820,84 +821,84 @@ msgstr "" "A maior valor, maior calidade do son, mais talvez non sexa compatible coa " "tarxeta" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "Dispositivo de GM:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "" "Especifica o dispositivo de son por defecto para a saэda de General MIDI" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "Non empregar mњsica en General MIDI" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "Empregar o primeiro dispositivo dispoёible" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "SoundFont щ compatible con algunhas tarxetas de son, FluidSynth e Timidity" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "Modo AdLib/MIDI mixto" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "Empregar xeraciѓn de son MIDI e mсis AdLib" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "Ganancia de MIDI:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "Configuraciѓn de FluidSynth" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "Dispositivo de MT-32:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Especifica o dispositivo por defecto para a saэda de Roland MT-32/LAPC1/" "CM32l/CM64" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 verdadeiro (sen emulaciѓn de GM)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" msgstr "" "Marcar para empregar o hardware compatible con Roland conectado ao sistema" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 (sen emulaciѓn de GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Dispositivo Roland GS (activar atribuciѓn MT-32)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -905,170 +906,182 @@ msgstr "" "Marcar para activar a atribuciѓn de parches e emular MT-32 nun dispositivo " "Roland GS" -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "Non empregar mњsica en Roland MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Texto e voz:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Voz" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Subtэtulos" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Ambos" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Velocidade dos subtэtulos:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Texto e voz:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Voz" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Subs" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "Ambos" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Mostrar os subtэtulos e reproducir as voces" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Velocidade subs:" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Volume de mњsica:" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Volume mњsica:" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Silenciar todo" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "Volume de efectos:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Volume dos efectos de son" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "Volume efectos:" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Volume de voz:" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Volume voz:" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Camiёo do tema:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Camiёo tema:" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Especificar o camiёo dos datos adicionais de todos os xogos ou de ScummVM" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Camiёo dos complementos:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Camiёo complementos:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Misc." -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "Procesamento da interfaz:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Autogardado:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Autogardado:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Teclas" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "Idioma de interfaz:" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "Idioma da interfaz de ScummVM" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Debes reiniciar ScummVM para que os cambios teёan efecto." -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Non щ posible escribir no directorio elixido. Selecciona outro." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Seleccionar directorio para temas de interfaz" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Seleccionar directorio para ficheiros adicionais" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Seleccionar directorio para complementos" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1241,39 +1254,60 @@ msgstr "Procesamento antidistorsiѓn" msgid "Antialiased" msgstr "Antidistorsiѓn" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "" + +#: gui/updates-dialog.cpp:92 +#, fuzzy +msgid "Check for updates automatically" +msgstr "Buscar actualizaciѓns..." + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Limpar valor" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "O motor non щ compatible co nivel de depuraciѓn %s" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Menњ" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Omitir" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pausa" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Omitir liёa" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Erro de execuciѓn do xogo:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "Non se puido atopar un motor para executar o xogo seleccionado" @@ -1368,6 +1402,23 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules сmbar" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "" + +#: common/updates.cpp:64 +#, fuzzy +msgid "<Bad value>" +msgstr "Limpar valor" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2302,7 +2353,7 @@ msgstr "" "Non esquezas asignar unha tecla с acciѓn Ocultar barra de ferramentas para " "ver o inventario completo" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "Buscar actualizaciѓns..." @@ -2874,6 +2925,15 @@ msgstr "" "Emprega o xogo de cursores prateados alternativo, no canto dos dourados " "normais." +#: engines/scumm/detection.cpp:1335 +#, fuzzy +msgid "Show Object Line" +msgstr "Mostrar etiquetas" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/po/hu_HU.po b/po/hu_HU.po index bd1f8ab112..1033063868 100644..100755 --- 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-04-01 19:18+0200\n" -"PO-Revision-Date: 2016-04-02 07:37+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\n" +"PO-Revision-Date: 2016-04-08 07:38+0200\n" "Last-Translator: George Kormendi <grubycza@hotmail.com>\n" "Language-Team: Hungarian\n" "Language: Magyar\n" @@ -55,10 +55,11 @@ msgstr "Feljebb" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -172,7 +173,7 @@ msgstr "Szэnusz" msgid "Triangle" msgstr "Hсromszіg" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Vegyes" @@ -206,7 +207,7 @@ msgstr "Minden FluidSynth beсllэtсs alapщrtelmezett щrtщkre." #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -240,15 +241,15 @@ msgstr "Bezсr" msgid "Mouse click" msgstr "Egщrkattintсs" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Billentyћzet beсllэtсsok" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Billentyћk сtсllэtсsa" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "Teljeskщpernyѕ kapcsolѓ" @@ -322,8 +323,8 @@ msgid "" msgstr "" "A jсtщk nyelve. Ne сllэtsd сt a pl. Spanyol nyelvћ jсtщkodat Angol nyelvre" -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<alapщrtelmezett>" @@ -345,11 +346,11 @@ msgstr "Platform:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Grafika" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "GFX" @@ -362,7 +363,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Globсlis grafikai beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Audiѓ" @@ -375,11 +376,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Globсlis audiѓ beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Hangerѕ" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "Hangerѕ" @@ -393,7 +394,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Globсlis hangerѕbeсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -406,7 +407,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Globсlis MIDI beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -419,11 +420,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Globсlis MT-32 beсllэtсsok felќlbэrсlсsa" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Mappсk" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Mappсk" @@ -437,7 +438,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Jсtщk Mappa:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Extra Mappa:" @@ -445,42 +446,42 @@ msgstr "Extra Mappa:" msgid "Specifies path to additional data used by the game" msgstr "Mappa kivсlasztсs a jсtщkok kiegщszэtѕ fсjljaihoz" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Extra Mappa:" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Mentщs Mappa:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Jсtщkmentщsek helyщnek meghatсrozсsa" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Mentщs Mappa:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Nincs" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Alapщrtelmezett" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "SoundFont kivсlasztсs" @@ -492,7 +493,7 @@ msgstr "Jсtщkok helyщnek kivсlasztсsa" msgid "Select additional game directory" msgstr "Vсlassz mappсt a jсtщk kiegщszэtѕkhіz" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Vсlaszz jсtщkmentщseknek mappсt" @@ -687,197 +688,197 @@ msgstr "Сtvсlt jсtщkra" msgid "Fast replay" msgstr "Gyors visszajсtszсs" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Soha" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "5 percenkщnt" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "10 percenkщnt" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "15 percenkщnt" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "30 percenkщnt" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Nincs" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Nщhсny grafikus opciѓ vсltoztatсsa sikertelen:" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "a videѓmѓd nem vсltozott." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "a teljeskщpernyѕs beсllэtсs nem vсltozott" -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "a kщpmщretarсny beсllэtсsok nem vсltoztak" -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Grafikus mѓd:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Kirajzolсs mѓd:" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Nщhсny jсtщk tсmogatja a speciсlis сrnyalсsi mѓdokat" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "Teljeskщpernyѕs mѓd:" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Kщpmщretarсny korrekciѓ" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "Helyes oldalarсny a 320x200 jсtщkokhoz" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Elsѕdleges eszkіz:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Zene eszkіz:" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "Elsѕdleges hangeszkіz vagy hang emulсtor beсllэtсsok" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "Hangeszkіz vagy hangkсrtya emulсtor beсllэtсsok" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Elsѕdleges eszk.:" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Zene eszkіz:" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "AdLib emulсtor:" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "AdLib meghajtѓt sok jсtщk hasznсlja zenщhez" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "Kimeneti rсta:" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" msgstr "" "Nagyobb щrtщkek jobb hangminѕsщget adnak, de nem minden hangkсrtya tсmogatja" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "GM Eszkіz:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "Alapщrtelmezett hangeszkіz General MIDI kimenethez" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "Ne hasznсlj General MIDI zenщt" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "Elsѕ elщrhetѕ eszkіz hasznсlata" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "Nщhсny hangkсrya, FluidSynth щs Timidyti tсmogatja a SoundFont betіltщsщt" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "Vegyes AdLib/MIDI mѓd" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "MIDI щs AdLib hanggenerсtorok hasznсlata" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "MIDI erѕsэtщs:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "FluidSynth Beсllэtсsa" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "MT-32 Eszkіz:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "Roland MT-32/LAPC1/CM32l/CM64 alapщrtelmezett hangeszkіzіk beсllэtсsa" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 Hardver (GM emulсciѓ tiltva)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -885,16 +886,16 @@ msgstr "" "Jelіld be, ha hardveres Roland-Kompatibilis hangeszkіz van csatlakoztatva a " "gщpedhez щs hasznсlni akarod" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 Hardver (GM emulсciѓ nincs)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS eszkіz (MT-32 mapping engedщlyezщs)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -902,169 +903,181 @@ msgstr "" "Ellenѕrzщs ha engedщlyezni akarod az emulсlt MT-32 Folt lekщpezщst a Roland " "GS eszkіzіn" -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "Ne hasznсlj Roland MT-32 zenщt" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Szіveg щs beszщd:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Csak beszщd" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Csak felirat" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Mind" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Felirat sebessщg:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Felirat щs beszщd:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Besz" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Text" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "Mind" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Hang щs feliratok megjelenэtщse" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Felirat sebessщg:" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Zene hangerѕ:" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Zene hangerѕ:" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "жsszes nщmэtсsa" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "SFX hangerѕ:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Speciсlis hangeffektusok hangereje" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX hangerѕ:" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Beszщd hangerѕ:" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Beszщd hangerѕ:" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Tщma Mappa:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Tщma Mappa:" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "Minden jщtщk щs ScummVM kiegщszэtѕ fсjljainak mappсja:" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Plugin Mappa:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugin Mappa:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Vegyes" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Tщma:" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "GUI Renderelѕ:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Automentщs:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Automentщs:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Billentyћk" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "GUI nyelve:" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "A ScummVM GUI nyelve" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "Frissэtщs ellenѕrzщs:" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "Milyen gyakran ellenѕrizze a ScummVM frissэtщseket" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "Ellenѕrzщs most" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Indэtsd њjra a ScummVM-et a vсltozсsok щrvщnyesэtщsщhez." -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "A kivсlasztott mappсba nem lehet эrni, vсlassz egy mсsikat" -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "GUI tщma mappa kivсlasztсsa" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Mappa vсlasztсs az extra fсjloknak" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Plugin mappa kivсlasztсsa" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1237,39 +1250,63 @@ msgstr "Щlsimэtсsos lekщpezѕ" msgid "Antialiased" msgstr "Щlsimэtott" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" +"ScummVM mсr tсmogatja az automatikus frissэtщseket\n" +"amelyhez internet hozzсfщrщs szќksщges.\n" +"\n" +"Szeretnщ, engedщlyezni ezt a funkciѓt?" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "(Bсrmikor engedщlyezheti a beсllэtсsok ablakban az Egyщb fќlnщl)" + +#: gui/updates-dialog.cpp:92 +msgid "Check for updates automatically" +msgstr "Frissэtщsek automatikus keresщse" + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "Folyamatban" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Щrtщk tіrlщse" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "A motor nem tсmogatja a '%s' debug szintet" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Menќ" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Tovсbb" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Szќnet" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Sor сtlщpщse" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Hiba a jсtщk futtatсsakor:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "Nem talсlhatѓ olyan jсtщkmotor ami a vсlasztott jсtщkot tсmogatja" @@ -1364,6 +1401,22 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Sсrga" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "Naponta" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "Hetente" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "Havonta" + +#: common/updates.cpp:64 +msgid "<Bad value>" +msgstr "<Rossz щrtщk>" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2293,7 +2346,7 @@ msgstr "" "Ne felejts billentyћt tсrsэtani az 'Eszkіztсr rejtщs' mћvelethez, hogy lсsd " "a teljes listсt" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "Frissэtщsek keresщse..." @@ -2856,6 +2909,14 @@ 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" +#: engines/scumm/detection.cpp:1335 +msgid "Show Object Line" +msgstr "Tсrgynщv sor lсthatѓ" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "Tсrgyak neveinek megjelenэtщse a kщpernyѕ aljсn" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/po/it_IT.po b/po/it_IT.po index 762ed12ccb..434dd6b46e 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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\n" "PO-Revision-Date: 2014-07-03 17:59-0600\n" "Last-Translator: Matteo 'Maff' Angelino <matteo.maff at gmail dot com>\n" "Language-Team: Italian\n" @@ -53,10 +53,11 @@ msgstr "Su" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -171,7 +172,7 @@ msgstr "Seno" msgid "Triangle" msgstr "Triangolo" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Varie" @@ -206,7 +207,7 @@ msgstr "" #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -241,15 +242,15 @@ msgstr "Chiudi" msgid "Mouse click" msgstr "Clic del mouse" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Mostra tastiera" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Riprogramma tasti" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "Attiva / disattiva schermo intero" @@ -324,8 +325,8 @@ msgid "" msgstr "" "Lingua del gioco. Un gioco inglese non potrр risultare tradotto in italiano" -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<predefinito>" @@ -347,11 +348,11 @@ msgstr "Piattaf.:" msgid "Engine" msgstr "Motore" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Grafica" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "Grafica" @@ -364,7 +365,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Ignora le impostazioni grafiche globali" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Audio" @@ -377,11 +378,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Ignora le impostazioni audio globali" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -395,7 +396,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Ignora le impostazioni globali di volume" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -408,7 +409,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Ignora le impostazioni MIDI globali" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -421,11 +422,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Ignora le impostazioni MT-32 globali" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Percorsi" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Perc." @@ -439,7 +440,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Perc. gioco:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Percorso extra:" @@ -447,42 +448,42 @@ msgstr "Percorso extra:" msgid "Specifies path to additional data used by the game" msgstr "Specifica il percorso di ulteriori dati usati dal gioco" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Perc. extra:" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Salvataggi:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Specifica dove archiviare i salvataggi" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Salvataggi:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Nessuno" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Predefinito" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "Seleziona SoundFont" @@ -494,7 +495,7 @@ msgstr "Seleziona la cartella contenente i file di gioco" msgid "Select additional game directory" msgstr "Seleziona la cartella di gioco aggiuntiva" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Seleziona la cartella dei salvataggi" @@ -694,134 +695,134 @@ msgstr "Sposta" msgid "Fast replay" msgstr "Modalitр veloce" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Mai" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "ogni 5 minuti" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "ogni 10 minuti" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "ogni 15 minuti" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "ogni 30 minuti" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Nessuno" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Impossibile applicare alcuni dei cambiamenti nelle opzioni grafiche." -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "impossibile modificare la modalitр video." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "impossibile modificare l'impostazione schermo intero" -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "impossibile modificare l'impostazione proporzioni" -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Modalitр:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Resa grafica:" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Modalitр di resa grafica speciali supportate da alcuni giochi" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "Modalitр a schermo intero" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Correzione proporzioni" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "Corregge le proporzioni dei giochi 320x200" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Disp. preferito:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Dispositivo audio:" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Specifica il dispositivo audio o l'emulatore della scheda audio preferiti" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "" "Specifica il dispositivo di output audio o l'emulatore della scheda audio" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferito:" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Disposit. audio:" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "Emulatore AdLib:" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "AdLib ш utilizzato per la musica in molti giochi" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "Frequenza:" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -829,66 +830,66 @@ msgstr "" "Valori piљ alti restituiscono un suono di maggior qualitр, ma potrebbero non " "essere supportati dalla tua scheda audio" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "Dispositivo GM:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "Specifica il dispositivo audio predefinito per l'output General MIDI" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "Non utilizzare la musica General MIDI" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "Utilizza il primo dispositivo disponibile" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "SoundFont ш supportato da alcune schede audio, FluidSynth e Timidity" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "Modalitр mista AdLib/MIDI" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "Utilizza generazione di suono sia MIDI che AdLib" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "Guadagno MIDI:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "Impostazioni FluidSynth" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "Disposit. MT-32:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Specifica il dispositivo audio predefinito per l'output Roland MT-32/LAPC1/" "CM32l/CM64" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 effettivo (disattiva emulazione GM)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -896,16 +897,16 @@ msgstr "" "Seleziona se vuoi usare il dispositivo hardware audio compatibile con Roland " "che ш connesso al tuo computer" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 effettivo (disat.emul.GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Dispositivo Roland GS (attiva mappature MT-32)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -913,169 +914,181 @@ msgstr "" "Seleziona se vuoi attivare le mappature per emulare un MT-32 su un " "dispositivo Roland GS" -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "Non utilizzare la musica Roland MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Testo e voci:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Voci" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Sottotitoli" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Entrambi" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Velocitр testo:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Testo e voci:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Voci" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Sub" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "Entr." -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Mostra i sottotitoli e attiva le voci" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Velocitр testo:" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Volume musica:" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Volume musica:" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Disattiva audio" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "Volume effetti:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Volume degli effetti sonori" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "Volume effetti:" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Volume voci:" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Volume voci:" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Percorso tema:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Perc. tema:" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "Specifica il percorso di ulteriori dati usati dai giochi o da ScummVM" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Percorso plugin:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Perc. plugin:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Varie" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "Renderer GUI:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Autosalva:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Autosalva:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Tasti" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "Lingua GUI:" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "Lingua dell'interfaccia grafica di ScummVM" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Devi riavviare ScummVM affinchщ le modifiche abbiano effetto." -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "La cartella scelta ш in sola lettura. Si prega di sceglierne un'altra." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Seleziona la cartella dei temi dell'interfaccia" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Seleziona la cartella dei file aggiuntivi" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Seleziona la cartella dei plugin" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1252,39 +1265,60 @@ msgstr "Renderer con antialiasing" msgid "Antialiased" msgstr "Con antialiasing" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "" + +#: gui/updates-dialog.cpp:92 +#, fuzzy +msgid "Check for updates automatically" +msgstr "Cerca aggiornamenti..." + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Cancella" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Il motore non supporta il livello di debug '%s'" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Menu" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Salta" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pausa" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Salta battuta" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Errore nell'esecuzione del gioco:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "" "Impossibile trovare un motore in grado di eseguire il gioco selezionato" @@ -1380,6 +1414,23 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules ambra" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "" + +#: common/updates.cpp:64 +#, fuzzy +msgid "<Bad value>" +msgstr "Cancella" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2320,7 +2371,7 @@ msgstr "" "Non dimenticare di mappare un tasto per l'azione \"Nascondi barra degli " "strumenti\" per vedere l'intero inventario" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "Cerca aggiornamenti..." @@ -2879,6 +2930,15 @@ msgid "" msgstr "" "Usa il set alternativo di cursori d'argento al posto di quelli normali d'oro" +#: engines/scumm/detection.cpp:1335 +#, fuzzy +msgid "Show Object Line" +msgstr "Mostra etichette oggetti" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/po/nb_NO.po b/po/nb_NO.po index 21e3e9f45c..de9be4c50e 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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\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" @@ -56,10 +56,11 @@ msgstr "Oppover" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -173,7 +174,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "Trekant" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Diverse" @@ -207,7 +208,7 @@ msgstr "Nullstill alle FluidSynth-instillinger til standardverdier" #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -241,15 +242,15 @@ msgstr "Lukk" msgid "Mouse click" msgstr "Musklikk" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Vis tastatur" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Omkoble taster" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "Veksle fullskjerm" @@ -325,8 +326,8 @@ msgstr "" "Spillets sprхk. Dette vil ikke gjјre din spanske spillversjon om til engelsk " "versjon" -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<standard>" @@ -348,11 +349,11 @@ msgstr "Plattform:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Grafikk" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "GFX" @@ -365,7 +366,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafikkinstillinger" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Lyd" @@ -378,11 +379,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lydinstillinger" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "Volum" @@ -396,7 +397,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale voluminstillinger" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -409,7 +410,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI-instillinger" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -422,11 +423,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32-instillinger" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Sti" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Sti" @@ -440,7 +441,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spillsti:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Ekstrasti:" @@ -448,42 +449,42 @@ msgstr "Ekstrasti:" msgid "Specifies path to additional data used by the game" msgstr "Bestemmer sti til ytterligere data brukt av spillet" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Lagringssti:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Bestemmer sti til lagrede spill" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Lagringssti:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Ingen" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "Velg SoundFont" @@ -495,7 +496,7 @@ msgstr "Velg mappe med spilldata" msgid "Select additional game directory" msgstr "Velg mappe med ytterligere data" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Velg mappe for lagrede spill" @@ -692,132 +693,132 @@ msgstr "Bytt til Spill" msgid "Fast replay" msgstr "Rask replay" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Aldri" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "hvert 5. min" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "hvert 10. min" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "hvert 15. min" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "hvert 30. min" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Klarte ikke х aktivere enkelte av endringene i grafikkinstillinger:" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "videomodusen kunne ikke endres." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "fullskjermsinnstillingen kunne ikke endres" -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "aspektrate-innstillingen kunne ikke endres" -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Grafikkmodus:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Tegnemodus:" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Spesiel dithering-modus stјttet av enkelte spill" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "Fullskjermsmodus" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Aspekt-rate korrigering" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "Korriger aspekt-rate for 320x200-spill" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Foretrukket enhet:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Musikkenhet:" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "Velger foretrukket lydenhet eller lydkort-emulator" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "Velger ut-lydenhet eller lydkortemulator" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Foretrukket enh.:" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Musikkenhet:" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "AdLib-emulator:" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "AdLib brukes til musikk i mange spill" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "Utrate:" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -825,64 +826,64 @@ msgstr "" "Hјyere verdier gir bedre lydkvalitet, men stјttes kanskje ikke av ditt " "lydkort " -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "GM-enhet:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "Velger standard lydenhet for General MIDI-utdata" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "Ikke bruk General MIDI-musikk" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "Bruk fјrste tilgjengelige enhet" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "SoundFont stјttes ikke av enkelte lydkort, FluidSynth og Timidity" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "Mikset AdLib/MIDI-modus" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "Bruk bхde MIDI- og AdLib- lydgenerering" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "FluidSynth-instillinger" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "MT-32 Enhet:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "Velger standard lydenhet for Roland MT-32/LAPC1/CM32I/CM64-avspilling" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -890,16 +891,16 @@ msgstr "" "Velg hvis du har et ekte Roland-kompatible lydkort tilkoblet maskinen, og " "vil bruke dette." -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS Modus (aktiver MT32-mapping)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -907,169 +908,181 @@ msgstr "" "Aktiver hvis du vil slх pх patch mappinger for х emulere en MT-32 eller " "Roland GS enhet" -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "Ikke bruk Roland MT-32-musikk" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Undertekster" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Begge" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Teksthastighet:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Tale" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Tekst" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "Begge" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Vis undertekster, og spill av tale" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Underteksthastighet:" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Demp alle" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Volum for spesielle lydeffekter" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "Velger sti for ytterligere data brukt av alle spill eller ScummVM" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Div" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "GUI-tegner:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Taster" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "GUI-sprхk:" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "Sprхk i ScummVM-GUIet" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Du mх starte ScummVM pх nytt for at endringene skal tre i kraft. " -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Den valgte mappen kan ikke skrives til. Vennligst velg en annen." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Velg mappe for GUI-temaer" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Velg mappe for ytterligere filer" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Velg mappe for plugins" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1242,39 +1255,60 @@ msgstr "Kantutjevnet tegner" msgid "Antialiased" msgstr "Kantutjevnet" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "" + +#: gui/updates-dialog.cpp:92 +#, fuzzy +msgid "Check for updates automatically" +msgstr "Sjekk for oppdateringer..." + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Tјm verdi" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Motoren stјtter ikke debug-nivх '%s'" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Meny" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Hopp over" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pause" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Hopp over linje" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Problem ved kjјring av spill:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "Kunne ikke finne noen motor som kunne kjјre det valgte spillet" @@ -1369,6 +1403,23 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Oransje" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "" + +#: common/updates.cpp:64 +#, fuzzy +msgid "<Bad value>" +msgstr "Tјm verdi" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2305,7 +2356,7 @@ msgstr "" "Ikke glem х koble en tast til handlingen 'Skjul verktјylinje' for х se hele " "inventaret" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "Sjekk for oppdateringer..." @@ -2868,6 +2919,15 @@ msgid "" msgstr "" "Bruk det alternative settet med sјlvmuspekere, istedenfor de normale gylne." +#: engines/scumm/detection.cpp:1335 +#, fuzzy +msgid "Show Object Line" +msgstr "Vis objektmerkelapper" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/po/nl_NL.po b/po/nl_NL.po index 4d850d4e40..032daf4590 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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\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" @@ -56,10 +56,11 @@ msgstr "Ga omhoog" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -173,7 +174,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "Driehoek" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Misc" @@ -207,7 +208,7 @@ msgstr "Alle FluidSynth instellingen terugzetten naar de standaard waarden." #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -242,15 +243,15 @@ msgstr "Sluiten" msgid "Mouse click" msgstr "Muisklik" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Toon toetsenbord" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Toetsen opnieuw koppelen" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "Volledig scherm in-/uitschakelen" @@ -326,8 +327,8 @@ msgstr "" "De taal van het spel. Dit verandert een Engels spel niet naar een " "Nederlandse." -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<standaard>" @@ -349,11 +350,11 @@ msgstr "Platform:" msgid "Engine" msgstr "Engine" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Beeld" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "GFX" @@ -366,7 +367,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Negeer algemene grafische instellingen" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Geluid" @@ -379,11 +380,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Negeer algemene audio instellingen" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -397,7 +398,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Negeer algemene volume instellingen" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -410,7 +411,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Negeer algemene MIDI instellingen" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -423,11 +424,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Negeer algemene MT-32 instellingen" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Paden" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Paden" @@ -441,7 +442,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spel Pad:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Extra Pad:" @@ -449,42 +450,42 @@ msgstr "Extra Pad:" msgid "Specifies path to additional data used by the game" msgstr "Specificeer pad naar additionele data voor het spel" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Extra Pad:" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Bewaar Pad:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Bepaalt waar opgeslagen spellen worden bewaard." -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Bewaar Pad:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Geen" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standaard" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "Selecteer SoundFont" @@ -496,7 +497,7 @@ msgstr "Selecteer map met speldata" msgid "Select additional game directory" msgstr "Selecteer additionele speldatamap" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Selecteer map voor opgeslagen spellen" @@ -698,132 +699,132 @@ msgstr "Schakel naar Spel" msgid "Fast replay" msgstr "Snelle herhaling" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Nooit" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "elke 5 minuten" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "elke 10 minuten" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "elke 15 minuten" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "elke 30 minuten" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Geen" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Sommige grafische opties konden niet worden toegepast:" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "de videomodus kon niet veranderd worden." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "de volledig-scherminstelling kon niet veranderd worden" -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "de pixelverhoudinginstelling kon niet veranderd worden" -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Grafische modus:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Render modus:" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Speciale ditheringmodi die door sommige games ondersteund worden." -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "Volledig-scherm modus" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Pixelverhoudingcorrectie" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "Corrigeer de pixelverhouding voor 320x200 spellen." -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Voorkeursapparaat:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Muziekapparaat:" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "Specificeert het voorkeurs geluidsapparaat of geluidskaartemulator" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "Specificeert geluidsapparaat of geluidskaartemulator" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Voorkeursapparaat:" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Muziekapparaat:" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "AdLib emulator:" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "AdLib word in vele spelen voor muziek gebruikt" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "Output snelheid:" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -831,67 +832,67 @@ msgstr "" "Hogere waarden geven betere geluidskwaliteit maar worden mogelijk niet " "ondersteund door uw geluidskaart." -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "GM Apparaat:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "Specificeert het standaard geluidsapparaat voor General MIDI" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "Geen General MIDI muziek gebruiken" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "Gebruik eerst beschikbare apparaat" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "SoundFont wordt ondersteund door FluidSynth en Timidity en sommige " "geluidskaarten." -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "Gemengde AdLib/MIDI modus" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "Gebruik zowel MIDI als AdLib geluid" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "FluidSynth Instellingen" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "MT-32 Apparaat:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Specificeert het standaard geluidsapparaat voor Roland MT-32/LAPC1/CM32l/CM64" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Waarheidsgetrouwe Roland MT-32 (GM emulatie uitschakelen)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -899,16 +900,16 @@ msgstr "" "Selecteer als u een hardware Roland-compatible geluidsapparaat gekoppeld aan " "uw computer wilt gebruiken" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Echte Roland MT-32 (geen GM emulatie)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS Device (met MT-32 mappings)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -916,171 +917,183 @@ msgstr "" "Selecteer dit als u patchmappings wilt om een MT-32 op een Roland GS " "apparaat te emuleren." -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "Geen Roland MT-32 muziek gebruiken" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Spraak en/of tekst:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Spraak" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Tekst" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Beide" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Snelheid tekst:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Spraak en/of text:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Sprk" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Text" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "Beide" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Toon tekst en speel spraak af" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Snelheid text:" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Muziek volume:" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Muziek volume:" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Alles Dempen" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "SFX volume:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Volume voor speciale geluidseffecten" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX volume:" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Spraak volume:" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Spraak volume:" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Thema Pad:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Thema Pad:" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Specificeert het pad for aanvullende data voor ScummVM zelf of de spellen." -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Plugins Pad:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugins Pad:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Misc" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Thema:" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "GUI Renderer:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Autosave:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Autosave:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Toetsen" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "GUI Taal:" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "Taal van de ScummVM GUI" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "U dient ScummVM opnieuw op te starten om de wijzigingen te activeren." -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "" "Er kan niet worden geschreven in de gekozen map. Selecteer a.u.b. een andere." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Selecteer map voor GUI themas" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Selecteer map voor extra bestanden" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Selecteer map voor plugins" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1253,39 +1266,60 @@ msgstr "Antialiased Renderer" msgid "Antialiased" msgstr "Antialiased" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "" + +#: gui/updates-dialog.cpp:92 +#, fuzzy +msgid "Check for updates automatically" +msgstr "Controleren op updates..." + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Veld leegmaken" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Engine ondersteunt debug level '%s' niet" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Menu" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Overslaan" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pauze" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Regel overslaan" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Fout tijdens het starten van spel:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "" "Kon geen engine vinden die in staat was het geselecteerde spel te spelen" @@ -1381,6 +1415,23 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Amber" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "" + +#: common/updates.cpp:64 +#, fuzzy +msgid "<Bad value>" +msgstr "Veld leegmaken" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2321,7 +2372,7 @@ msgstr "" "Vergeet niet de 'Verberg werkbalk' te koppelen aan een toets om de hele " "inventaris te zien." -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "Controleren op updates..." @@ -2895,6 +2946,15 @@ msgstr "" "Gebruik de alternative set van zilveren cursors, in plaats van de normale " "gouden" +#: engines/scumm/detection.cpp:1335 +#, fuzzy +msgid "Show Object Line" +msgstr "Toon objectnamen" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/po/nn_NO.po b/po/nn_NO.po index d216f1e3f4..e09e138dcc 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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\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" @@ -56,10 +56,11 @@ msgstr "Oppover" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -173,7 +174,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "Triangel" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Diverse" @@ -207,7 +208,7 @@ msgstr "Nullstill alle FluidSynth-instillingar til standardverdiar" #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -241,15 +242,15 @@ msgstr "Steng" msgid "Mouse click" msgstr "Musklikk" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Syn Tastatur" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Omkople tastar" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "Veksle fullskjerm" @@ -325,8 +326,8 @@ msgstr "" "Spelets sprхk. Dette vil ikkje gjere den spanske versjonen av spelet til ein " "engelsk versjon" -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<standard>" @@ -348,11 +349,11 @@ msgstr "Plattform:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Grafikk" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "GFX" @@ -365,7 +366,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafikkinstillingar" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Lyd" @@ -378,11 +379,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lydinstillingar" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "Volum" @@ -396,7 +397,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale voluminstillingar" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -409,7 +410,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI-instillingar" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -422,11 +423,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32-instillingar" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Stiar" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Stiar" @@ -440,7 +441,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spelsti:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Ekstrasti:" @@ -448,42 +449,42 @@ msgstr "Ekstrasti:" msgid "Specifies path to additional data used by the game" msgstr "Veljer sti til tilleggsdata nytta av spelet" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Lagringssti:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Veljer kor lagra spel vert lagra" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Lagringssti:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Ingen" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "Vel SoundFont" @@ -495,7 +496,7 @@ msgstr "Vel mappe med speldata" msgid "Select additional game directory" msgstr "Vel mappe med tileggsdata for spelet" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Vel mappe for lagra spel" @@ -690,132 +691,132 @@ msgstr "Bytt til spel" msgid "Fast replay" msgstr "" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Aldri" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "kvart 5. min" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "kvart 10. min" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "kvart 15. min" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "kvart 30. min" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Klarte ikkje х aktivere nokre av grafikkvalendringane:" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "Kunne ikkje endre videomodus." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "Fullskjerminstillinga kunne ikkje endrast" -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "aspektrate-innstillinga kunne ikkje endrast" -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Grafikkmodus:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Teiknemodus:" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Spesielle dithering-modus som stјttast av nokre spel" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "Fullskjermsmodus" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Aspekt-korrigering" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "Rett opp aspekt for 320x200 spel" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Fјretrukken eining:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Musikkeining:" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Musikkeining:" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "AdLib emulator:" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "AdLib nyttast til musikk i mange spel" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -823,64 +824,64 @@ msgstr "" "Hјgare verdier gir betre lydkvalitet, men stјttast kanskje ikkje av " "lydkortet ditt" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "GM Eining:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "Veljer standard lydeining for General MIDI avspeling" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "Ikkje nytt General MIDI musikk" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "Nytt fјrste tilgjengelege eining" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "SoundFont stјttast av enkelte lydkort, FluidSynth og Timidity" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "Blanda AdLib/MIDI-modus" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "Nytt bхe MIDI og AdLib lydskaping" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "FluidSynth instillingar" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "MT-32 Eining:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "Veljer standard lydeining for Roland MT-32/LAPC1/CM32l/CM64 avspeling" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -888,184 +889,196 @@ msgstr "" "Vel om du vil nytte din Roland-kompatible lydeining som du har tilkopla " "datamaskina di." -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Ekte Roland MT-32 (ingen GS-emulering)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" msgstr "" -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "Ikkje nytt Roland MT-32 musikk" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Teksting" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Begge" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Undertekstfart:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Tale" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Tekst" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "Bхe" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Vis teksting og spel av tale" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Undertekstfart:" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Demp alle" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Spesiallydeffekt volum" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Div" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "GUI-teiknar:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Tastar" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "GUI-sprхk:" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "Sprхk i ScummVM-GUIet" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Du mх starte ScummVM pх nytt for at endringane skal tre i kraft." -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Den velde mappa kan ikkje skrivast til. Vennlegst vel ein annan." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Vel ei mappe for GUI-tema:" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Vel ei mappe for ekstra filer" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Vel ei mappe for plugins" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1238,39 +1251,60 @@ msgstr "Kantutjevna teiknar" msgid "Antialiased" msgstr "Kantutjevna" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "" + +#: gui/updates-dialog.cpp:92 +#, fuzzy +msgid "Check for updates automatically" +msgstr "SJх etter oppdateringar..." + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Tјm verdi" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Motoren stјttar ikkje debug-nivх '%s'" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Meny" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Hopp over" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pause" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Hopp over linje" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Feil under kјyring av spel:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "Kunne ikkje finne nokon motor som kunne kјyre det velde spelet." @@ -1365,6 +1399,23 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Raudgul" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "" + +#: common/updates.cpp:64 +#, fuzzy +msgid "<Bad value>" +msgstr "Tјm verdi" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2296,7 +2347,7 @@ msgstr "" "Ikkje glјym х kople ein tast til 'Skjul verktјylinje' for х se heile " "inventaret" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "SJх etter oppdateringar..." @@ -2818,6 +2869,15 @@ 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" +#: engines/scumm/detection.cpp:1335 +#, fuzzy +msgid "Show Object Line" +msgstr "Syn objektmerkelappar" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/po/pl_PL.po b/po/pl_PL.po index 4b8f45c6ec..3ed207efea 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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\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" @@ -59,10 +59,11 @@ msgstr "W gѓrъ" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -176,7 +177,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "TrѓjkБt" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "RѓПne" @@ -210,7 +211,7 @@ msgstr "Przywrѓц domyЖlne wartoЖci wszystkich ustawieё FluidSynth." #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -244,15 +245,15 @@ msgstr "Zamknij" msgid "Mouse click" msgstr "Klikniъcie" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "WyЖwietl klawiaturъ" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Dostosuj klawisze" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "WГБcz/wyГБcz peГny ekran" @@ -326,8 +327,8 @@ msgid "" "English" msgstr "Jъzyk gry. Nie zmieni to hiszpaёskiej wersji gry w angielskБ." -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<domyЖlne>" @@ -349,11 +350,11 @@ msgstr "Platforma:" msgid "Engine" msgstr "Silnik" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Grafika" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "Grafika" @@ -366,7 +367,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "UПyj wГasnych ustawieё grafiki" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "DМwiъk" @@ -379,11 +380,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "UПyj wГasnych ustawieё dМwiъku" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "GГoЖnoЖц" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "GГoЖnoЖц" @@ -397,7 +398,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "UПyj wГasnych ustawieё gГoЖnoЖci" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -410,7 +411,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "UПyj wГasnych ustawieё MIDI" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -423,11 +424,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "UПyj wГasnych ustawieё MT-32" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "ІcieПki" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "ІcieПki" @@ -441,7 +442,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "ІcieПka gry:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Іc. dodatkѓw:" @@ -449,42 +450,42 @@ msgstr "Іc. dodatkѓw:" msgid "Specifies path to additional data used by the game" msgstr "OkreЖla ЖcieПkъ dodatkowych danych gry" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Іc. dodatkѓw:" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "ІcieПka zapisѓw:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "OkreЖla gdzie zapisywaц stan gry" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "ІcieПka zapisѓw:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Brak" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "DomyЖlnie" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "Wybierz SoundFont" @@ -496,7 +497,7 @@ msgstr "Wybierz katalog z plikami gry" msgid "Select additional game directory" msgstr "Wybierz dodatkowy katalog gry" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Wybierz katalog dla zapisѓw" @@ -689,132 +690,132 @@ msgstr "PrzeГБcz do gry" msgid "Fast replay" msgstr "Szybka powtѓrka" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Nigdy" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "co 5 min" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "co 10 min" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "co 15 min" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "co 30 min" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Brak" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Nie udaГo siъ zastosowaц czъЖci zmian opcji grafiki:" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "nie udaГo siъ zmieniц trybu wideo." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "nie udaГo siъ zmieniц trybu peГnoekranowego" -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "nie udaГo siъ zmieniц formatu obrazu" -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Tryb grafiki:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Renderer:" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Specjalne tryby ditheringu wspierane przez niektѓre gry" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "PeГny ekran" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Korekcja formatu obrazu" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "Korekcja formatu obrazu dla gier 320x200" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Pref. urzБdzenie:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Urz. muzyczne:" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "OkreЖla preferowane urzБdzenie dМwiъkowe lub emulator karty dМwiъkowej" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "OkreЖla wyjЖciowe urzБdzenie dМwiъkowe lub emulator karty dМwiъkowej" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Pref. urzБdzenie:" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Urz. muzyczne:" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "Emulator AdLib:" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "AdLib jest uПywany do muzyki w wielu grach" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "Czъst. wyj.:" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -822,67 +823,67 @@ msgstr "" "WyПsze wartoЖci dajБ lepszБ jakoЖц dМwiъku, ale mogБ byц nieobsГugiwane " "przez twojБ kartъ dМwiъkowБ" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "UrzБdzenie GM:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "OkreЖla domyЖlne urzБdzenie dМwiъkowe dla wyjЖcia General MIDI" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "Nie uПywaj muzyki General MIDI" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "UПyj pierwszego dostъpnego urzБdzenia" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "SoundFont jest wspierany przez niektѓre karty dМwiъkowe, FluidSynth i " "Timidity" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "Tryb miksowanego AdLib/MIDI" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "UПywaj obu generatorѓw dМwiъku, MIDI i AdLib, jednoczeЖnie" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "Wzm. MIDI:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "Ustawienia FluidSynth" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "UrzБdzenie MT-32:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "OkreЖla domyЖlne urzБdzenie dМwiъku dla wyjЖcia Roland MT-32/LAPC1/CM32l/CM64" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Prawdziwy Roland MT-32 (wyГБcz emulacjъ GM)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -890,16 +891,16 @@ msgstr "" "Zaznacz, jeЖli chcesz uПywaц swojej prawdziwej karty kompatybilnej z Roland " "podГБczonej do twojego komputera" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Prawdziwy Roland MT-32 (brak emulacji GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland w trybie GS (wГБcz mapowanie MT-32)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -907,169 +908,181 @@ msgstr "" "Zaznacz, jeЖli chcesz wГБczyц Гatki mapowania pozwalajБce na emulacjъ MT-32 " "na urzБdzeniu Roland GS" -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "Nie uПywaj muzyki Roland MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Tekst i mowa:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Mowa" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Napisy" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Oba" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Prъd. napisѓw:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst i mowa:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Mowa" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Napisy" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "Oba" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "WyЖwietlaj napisy i odtwarzaj mowъ" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Prъd. napisѓw:" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "GГoЖnoЖц muzyki:" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "GГoЖnoЖц muzyki:" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Wycisz" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "GГ. efekt. dМw.:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "GГoЖnoЖц efektѓw dМw." -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "GГ. efekt. dМw.:" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "GГoЖnoЖц mowy:" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "GГoЖnoЖц mowy:" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "ІcieПka stylu:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "ІcieПka stylu:" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "OkreЖla ЖcieПkъ dla dodatkowych danych dla wszystkich gier lub ScummVM" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "ІcieПka wtyczek:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "ІcieПka wtyczek:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "RѓПne" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Styl:" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "Renderer interf.:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Autozapis:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Autozapis:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Klawisze" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "Jъzyk interfejsu:" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "Jъzyk interfejsu ScummVM" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Musisz zrestartowaц ScummVM, by zmiany zostaГy uwzglъdnione." -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Ten katalog jest zabezpieczony przed zapisem. Wybierz inny." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Wybierz katalog dla stylѓw GUI." -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Wybierz katalog dla dodatkowych plikѓw" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Wybierz katalog dla wtyczek" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1242,39 +1255,60 @@ msgstr "WygГadzany renderer" msgid "Antialiased" msgstr "WygГadzany" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "" + +#: gui/updates-dialog.cpp:92 +#, fuzzy +msgid "Check for updates automatically" +msgstr "SprawdМ aktualizacjъ..." + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "WyczyЖц" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Silnik nie wspiera poziomu debugowania '%s'" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Menu" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Pomiё" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Wstrzymaj" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Pomiё liniъ" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "BГБd podczas uruchamiania gry:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "Nie udaГo siъ znaleМц silnika zdolnego do uruchomienia zaznaczonej gry" @@ -1369,6 +1403,23 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Bursztynowy Hercules" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "" + +#: common/updates.cpp:64 +#, fuzzy +msgid "<Bad value>" +msgstr "WyczyЖц" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2297,7 +2348,7 @@ msgstr "" "Nie zapomnij przypisaц klawisza 'Ukryj pasek narzъdzi', by widzieц caГy " "ekwipunek" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "SprawdМ aktualizacjъ..." @@ -2860,6 +2911,15 @@ msgid "" msgstr "" "UПyj alternatywnego zestawu srebrnych kursorѓw zamiast zwykГych zГotych" +#: engines/scumm/detection.cpp:1335 +#, fuzzy +msgid "Show Object Line" +msgstr "PokaП etykiety obiektѓw" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/po/pt_BR.po b/po/pt_BR.po index 61cc0b9376..adf05bbf79 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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\n" "PO-Revision-Date: 2011-10-21 21:30-0300\n" "Last-Translator: Saulo Benigno <saulobenigno@gmail.com>\n" "Language-Team: ScummBR (www.scummbr.com) <scummbr@yahoo.com.br>\n" @@ -58,10 +58,11 @@ msgstr "Acima" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -179,7 +180,7 @@ msgstr "" msgid "Triangle" msgstr "" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Outros" @@ -213,7 +214,7 @@ msgstr "" #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -247,15 +248,15 @@ msgstr "Fechar" msgid "Mouse click" msgstr "Clique do mouse" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Mostrar teclado" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Remapear teclas" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 #, fuzzy msgid "Toggle fullscreen" msgstr "Habilita Tela Cheia" @@ -330,8 +331,8 @@ msgid "" "English" msgstr "Idioma do jogo. Isto nуo irс passar seu jogo Inglъs para Portuguъs" -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<padrуo>" @@ -354,11 +355,11 @@ msgstr "Sistema:" msgid "Engine" msgstr "Examinar" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Grсficos" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "GFX" @@ -371,7 +372,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Sobrepor configuraчуo global de grсficos" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Сudio" @@ -384,11 +385,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Sobrepor configuraчуo global de сudio" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Volume" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -402,7 +403,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Sobrepor configuraчуo global de volume" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -415,7 +416,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Sobrepor configuraчуo global de MIDI" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -428,11 +429,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Sobrepor configuraчуo global de MT-32" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Pastas" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Pastas" @@ -446,7 +447,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Pasta do Jogo:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Pasta de Extras" @@ -454,42 +455,42 @@ msgstr "Pasta de Extras" msgid "Specifies path to additional data used by the game" msgstr "Especifique a pasta para dados utilizados no jogo" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Pasta de Extras" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Pasta para Salvar" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Especifique onde guardar seus jogos salvos" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Pasta para Salvar" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Nenhum(a)" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Padrуo" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "Selecione o SoundFont" @@ -501,7 +502,7 @@ msgstr "Selecione a pasta com os arquivos do jogo" msgid "Select additional game directory" msgstr "Selecione a pasta adicional do jogo" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Selecione a pasta para os jogos salvos" @@ -705,132 +706,132 @@ msgstr "Trocar" msgid "Fast replay" msgstr "Modo rсpido" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Nunca" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "a cada 5 mins" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "a cada 10 mins" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "a cada 15 mins" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "a cada 30 mins" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Nenhum(a)" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Falha ao aplicar algumas mudanчas nas opчѕes de grсfico:" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "o modo de vэdeo nуo pєde ser alterado." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "a configuraчуo de tela cheia nуo pєde ser mudada" -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "a configuraчуo de proporчуo nуo pєde ser mudada" -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Modo grсfico:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Renderizaчуo" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Modos especiais de dithering suportados por alguns jogos" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "Modo Tela Cheia" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Correчуo de proporчуo" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "Correчуo de proporчуo para jogos 320x200" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Dispositivo pref.:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "Especifica o dispositivo de som preferido ou emulador de placa de som" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "Especifica o dispositivo de saэda de som ou emulador de placa de som" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Dispositivo pref.:" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Dispositivo de mњsica:" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "Emulador AdLib:" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "AdLib щ utilizado para mњsica em vсrios jogos" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "Taxa de saэda:" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -838,66 +839,66 @@ msgstr "" "Maior valor especifica melhor qualidade de som, mas pode nуo ser suportado " "por sua placa de som" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "Dispositivo GM:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "Especifique o dispositivo de som padrуo para a saэda General MIDI" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "Nуo usar mњsica General MIDI" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "Usar o primeiro dispositivo disponэvel" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "SoundFont щ suportado por algumas placas de som, FluidSynth e Timidity" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "Mixar AdLib/MIDI" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "Usar MIDI e AdLib juntos na geraчуo de som" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "Ganho MIDI:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "Dispositivo MT-32:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Especifique o dispositivo de som padrуo para a saэda Roland MT-32/LAPC1/" "CM32l/CM64" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 real (desligar emulaчуo GM)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -905,187 +906,199 @@ msgstr "" "Verifique se vocъ quer usar o seu dispositivo de hardware de som compatэvel " "com Roland" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 real (sem emulaчуo GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 #, fuzzy msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland MT-32 real (desligar emulaчуo GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" msgstr "" -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "Nуo usar mњsica Roland MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Texto e Voz:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Voz" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Legendas" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Ambos" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Rapidez legendas:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Texto e Voz:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Voz" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Legs" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "Ambos" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Mostrar legenda e vozes (dublagem)" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Velocidade das legendas:" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Volume da Mњsica:" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Volume da Mњsica:" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Mudo" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "Volume dos Sons:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Volume dos efeitos sonoros especiais" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "Volume dos Sons:" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Volume da Voz:" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Volume da Voz:" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Pasta do Tema" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Pasta do Tema" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Especifica a pasta para os dados adicionais usados por todos os jogos ou " "ScummVM" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Pasta de Plugins:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pasta de Plugins:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Outros" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "Renderizador GUI:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Auto-Salvar:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Auto-Salvar:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Teclas" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "Idioma do GUI:" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "Linguagem do ScummVM GUI" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Vocъ tem que reiniciar o ScummVM para funcionar." -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "O diretѓrio escolhido nуo pode ser usado. Por favor, selecione outro." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Selecione a pasta para os temas da Interface de Uso Grсfico" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Selecione a pasta para os arquivos extras" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Selecione a pasta para os plugins" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1269,39 +1282,60 @@ msgstr "Renderizador Anti-Serrilhamento (16bpp)" msgid "Antialiased" msgstr "Anti-Serrilhamento (16bpp)" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "" + +#: gui/updates-dialog.cpp:92 +#, fuzzy +msgid "Check for updates automatically" +msgstr "Procurar por Atualizaчѕes..." + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Limpar valor" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Esse programa nуo suporta o nэvel de debug '%s'" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Menu" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Pular" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pausar" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Pula linha" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Erro ao executar o jogo:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "" "Nуo foi possэvel encontrar qualquer programa capaz de rodar o jogo " @@ -1398,6 +1432,23 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Amber" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "" + +#: common/updates.cpp:64 +#, fuzzy +msgid "<Bad value>" +msgstr "Limpar valor" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2344,7 +2395,7 @@ msgstr "" "Nуo se esqueчa de mapear uma tecla para \"Ocultar a barra de ferramentas\" " "para ver todo o seu inventсrio" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "Procurar por Atualizaчѕes..." @@ -2912,6 +2963,14 @@ msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" +#: engines/scumm/detection.cpp:1335 +msgid "Show Object Line" +msgstr "" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/po/ru_RU.po b/po/ru_RU.po index 46ff1853cd..514d094e64 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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\n" "PO-Revision-Date: 2016-02-21 23:32+0300\n" "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n" "Language-Team: Russian\n" @@ -56,10 +56,11 @@ msgstr "Вверх" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -173,7 +174,7 @@ msgstr "Синусоида" msgid "Triangle" msgstr "Треугольная" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Разное" @@ -207,7 +208,7 @@ msgstr "Сбросить все установки FluidSynth в значения по умолчанию." #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -242,15 +243,15 @@ msgstr "Закрыть" msgid "Mouse click" msgstr "Клик мышью" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Показать клавиатуру" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Переназначить клавиши" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "Переключение на весь экран" @@ -325,8 +326,8 @@ msgid "" msgstr "" "Язык игры. Изменение этой настройки не превратит игру на английском в русскую" -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<по умолчанию>" @@ -348,11 +349,11 @@ msgstr "Платформа:" msgid "Engine" msgstr "Движок" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Графика" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "Грф" @@ -365,7 +366,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Перекрыть глобальные установки графики" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Аудио" @@ -378,11 +379,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Перекрыть глобальные установки аудио" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Громкость" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "Громк" @@ -396,7 +397,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Перекрыть глобальные установки громкости" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -409,7 +410,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Перекрыть глобальные установки MIDI" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -422,11 +423,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Перекрыть глобальные установки MT-32" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Пути" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Пути" @@ -440,7 +441,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Где игра:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Доп. путь:" @@ -448,42 +449,42 @@ msgstr "Доп. путь:" msgid "Specifies path to additional data used by the game" msgstr "Указывает путь к дополнительным файлам данных для игры" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Доп. путь:" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Сохранения игр:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Указывает путь к сохранениям игры" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Путь сохр:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Не задан" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "По умолчанию" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "Выберите SoundFont" @@ -495,7 +496,7 @@ msgstr "Выберите директорию с файлами игры" msgid "Select additional game directory" msgstr "Выберите дополнительную директорию игры" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Выберите директорию для сохранений" @@ -689,133 +690,133 @@ msgstr "Переключиться в игру" msgid "Fast replay" msgstr "Быстрое воспроизведение" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Никогда" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "каждые 5 минут" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "каждые 10 минут" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "каждые 15 минут" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "каждые 30 минут" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 кГц" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 кГц" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 кГц" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 кГц" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 кГц" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Не задан" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Не удалось применить изменения некоторых графических настроек:" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "видеорежим не может быть изменён." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "полноэкранный режим не может быть изменён" -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "режим корректировки соотношения сторон не может быть изменён" -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Граф. режим:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Режим растра:" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Специальные режимы рендеринга, поддерживаемые некоторыми играми" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "Полноэкранный режим" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Коррекция соотношения сторон" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "Корректировать соотношение сторон для игр с разрешением 320x200" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Предпочитаемое:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Звуковое уст-во:" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Указывает предпочитаемое звуковое устройство или эмулятор звуковой карты" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "Указывает выходное звуковое устройство или эмулятор звуковой карты" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Предпочитаемое:" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Звуковое уст-во:" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "Эмулятор AdLib:" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "Звуковая карта AdLib используется многими играми" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "Частота звука:" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -823,68 +824,68 @@ msgstr "" "БОльшие значения задают лучшее качество звука, однако они могут не " "поддерживаться вашей звуковой картой" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "Устройство GM:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "Указывает выходное звуковое устройство для MIDI" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "Не использовать музыку для General MIDI" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "Использовать первое доступное устройство" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "SoundFont'ы поддерживаются некоторыми звуковыми картами, FluidSynth и " "Timidity" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "Смешанный режим AdLib/MIDI" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "Использовать и MIDI, и AdLib для генерации звука" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "Усиление MIDI:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "Настройки FluidSynth" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "Устр. MT-32:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Указывает звуковое устройство по умолчанию для вывода на Roland MT-32/LAPC1/" "CM32l/CM64" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Настоящий Roland MT-32 (запретить эмуляцию GM)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -892,16 +893,16 @@ msgstr "" "Отметьте, если у вас подключено Roland-совместимое звуковое устройство и вы " "хотите его использовать" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Настоящий Roland MT-32 (без эмуляции GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Устройство Roland GS (разрешить маппинг MT-32)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -909,171 +910,183 @@ msgstr "" "Отметьте, если хотите разрешить маппинг для эмуляции MT-32 на устройстве " "Roland GS" -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "Не использовать музыку для MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Текст и озвучка:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Озвучка" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Субтитры" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Оба" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Скорость титров:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Текст и озвучка:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Озв" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Суб" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "Оба" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Показывать субтитры и воспроизводить речь" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Скорость титров:" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Громк. музыки:" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Громк. музыки:" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Выкл. всё" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "Громкость SFX:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Громкость специальных звуковых эффектов" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "Громк. SFX:" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Громк. озвучки:" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Громк. озвучки:" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Путь к темам:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Где темы:" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Указывает путь к дополнительным файлам данных, используемых всеми играми " "либо ScummVM" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Путь к плагинам:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Путь к плагинам:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Разное" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Тема:" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "Рисовалка GUI:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Автосохранение:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Автосохр.:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Клавиши" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "Язык GUI:" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "Язык графического интерфейса ScummVM" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "Проверять обновления:" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "Как часто проверять обновления ScummVM" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "Проверить сейчас" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Вы должны перезапустить ScummVM, чтобы применить изменения." -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Не могу писать в выбранную директорию. Пожалуйста, укажите другую." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Выберите директорию для тем GUI" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Выберите директорию с дополнительными файлами" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Выберите директорию с плагинами" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1246,39 +1259,63 @@ msgstr "Растеризатор со сглаживанием" msgid "Antialiased" msgstr "Со сглаживанием" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" +"ScummVM стал поддерживать автоматическую проверку\n" +"обновлений, которая требует доступа в Интернет\n" +"\n" +"Хотели бы вы включить эту опцию?" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "(Вы можете всегда её включыть в Опциях на закладку Другое)" + +#: gui/updates-dialog.cpp:92 +msgid "Check for updates automatically" +msgstr "Автоматически проверить обновления" + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "Продолжить" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Очистить значение" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Движок не поддерживает уровень отладки '%s'" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Меню" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Пропустить" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Пауза" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Пропустить строку" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Ошибка запуска игры:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "Не могу найти движок для запуска выбранной игры" @@ -1373,6 +1410,22 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Янтарный" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "Ежедневно" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "Еженедельно" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "Ежемесячно" + +#: common/updates.cpp:64 +msgid "<Bad value>" +msgstr "<Неправильное значение>" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2309,7 +2362,7 @@ msgstr "" "Не забудьте назначить клавишу для действия 'Hide Toolbar', чтобы увидеть " "весь инвентарь в игре" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "Проверить обновления..." @@ -2664,11 +2717,11 @@ msgstr "" #: engines/mohawk/detection.cpp:168 msgid "Play the Myst fly by movie" -msgstr "" +msgstr "Проигрывать ролик пролёта над Myst" #: engines/mohawk/detection.cpp:169 msgid "The Myst fly by movie was not played by the original engine." -msgstr "" +msgstr "Ролик пролёта над Myst не проигрывался оригинальным движком." #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 @@ -2884,6 +2937,14 @@ msgid "" msgstr "" "Использовать альтернативный набор серебряных курсоров вместо обычных золотых" +#: engines/scumm/detection.cpp:1335 +msgid "Show Object Line" +msgstr "Показывать линии объектов" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "Показывать названия объектов внизу экрана" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." @@ -3811,70 +3872,3 @@ msgid "Use MPEG video from the DVD version, instead of lower resolution AVI" msgstr "" "Использовать MPEG-видео из DVD-версии вместо видео низкого разрешения в " "формате AVI" - -#~ msgid "EGA undithering" -#~ msgstr "EGA без растра" - -#~ msgid "Enable undithering in EGA games" -#~ msgstr "Включает режим без растрирования в EGA играх" - -#~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2" -#~ msgstr "" -#~ "Найдены заставки в формате MPEG-2, но ScummVM был собран без поддержки " -#~ "MPEG-2" - -#~ msgctxt "lowres" -#~ msgid "Mass Add..." -#~ msgstr "Много игр..." - -#~ msgid "" -#~ "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" -#~ msgstr "" -#~ "Выключает сопоставление General MIDI для игр с звуковой дорожкой для " -#~ "Roland MT-32" - -#~ msgid "Standard (16bpp)" -#~ msgstr "Стандартный растеризатор (16bpp)" - -#~ msgid "MPEG2 cutscenes are no longer supported" -#~ msgstr "Заставки в формате MPEG2 больше не поддерживаются" - -#~ msgid "OpenGL Normal" -#~ msgstr "OpenGL без увеличения" - -#~ msgid "OpenGL Conserve" -#~ msgstr "OpenGL с сохранением" - -#~ msgid "OpenGL Original" -#~ msgstr "OpenGL изначальный" - -#~ msgid "Current display mode" -#~ msgstr "Текущий видеорежим" - -#~ msgid "Current scale" -#~ msgstr "Текущий масштаб" - -#~ msgid "Active filter mode: Linear" -#~ msgstr "Активный режим фильтра: Линейный" - -#~ msgid "Active filter mode: Nearest" -#~ msgstr "Активный режим фильтра: Ближайший" - -#~ msgid "Enable Roland GS Mode" -#~ msgstr "Включить режим Roland GS" - -#~ msgctxt "lowres" -#~ msgid "Add Game..." -#~ msgstr "Доб. игру" - -#~ msgid "Add Game..." -#~ msgstr "Добавить игру..." - -#~ msgid "Discovered %d new games." -#~ msgstr "Найдено %d новых игр." - -#~ msgid "Command line argument not processed" -#~ msgstr "Параметры командной строки не обработаны" - -#~ msgid "Invalid Path" -#~ msgstr "Неверный путь" diff --git a/po/scummvm.pot b/po/scummvm.pot index 46866a5e73..8bc74ef781 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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -54,10 +54,11 @@ msgstr "" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -171,7 +172,7 @@ msgstr "" msgid "Triangle" msgstr "" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "" @@ -205,7 +206,7 @@ msgstr "" #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -238,15 +239,15 @@ msgstr "" msgid "Mouse click" msgstr "" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "" @@ -318,8 +319,8 @@ msgid "" "English" msgstr "" -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "" @@ -341,11 +342,11 @@ msgstr "" msgid "Engine" msgstr "" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "" @@ -358,7 +359,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "" @@ -371,11 +372,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "" @@ -389,7 +390,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "" @@ -402,7 +403,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "" @@ -415,11 +416,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "" @@ -433,7 +434,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "" @@ -441,42 +442,42 @@ msgstr "" msgid "Specifies path to additional data used by the game" msgstr "" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "" @@ -488,7 +489,7 @@ msgstr "" msgid "Select additional game directory" msgstr "" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "" @@ -680,378 +681,390 @@ msgstr "" msgid "Fast replay" msgstr "" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "" -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "" -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "" -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" msgstr "" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" msgstr "" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" msgstr "" -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "" -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "" -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1222,39 +1235,59 @@ msgstr "" msgid "Antialiased" msgstr "" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "" + +#: gui/updates-dialog.cpp:92 +msgid "Check for updates automatically" +msgstr "" + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "" @@ -1349,6 +1382,22 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "" + +#: common/updates.cpp:64 +msgid "<Bad value>" +msgstr "" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2251,7 +2300,7 @@ msgid "" "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" msgstr "" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "" @@ -2759,6 +2808,14 @@ msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" +#: engines/scumm/detection.cpp:1335 +msgid "Show Object Line" +msgstr "" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/po/sv_SE.po b/po/sv_SE.po index 7788870dea..894dfadec3 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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\n" "PO-Revision-Date: 2016-02-25 23:06+0100\n" "Last-Translator: Hampus Flink <hampus.flink@gmail.com>\n" "Language-Team: \n" @@ -56,10 +56,11 @@ msgstr "Uppхt" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -173,7 +174,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "Triangel" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Diverse" @@ -208,7 +209,7 @@ msgstr "" #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -243,15 +244,15 @@ msgstr "Stфng" msgid "Mouse click" msgstr "Musklick" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Visa tangentbord" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Stфll in tangenter" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "Fullskфrmslфge" @@ -327,8 +328,8 @@ msgstr "" "Spelets sprхk. Den hфr instфllningen omvandlar inte din spanska spelversion " "till en engelsk" -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<standard>" @@ -350,11 +351,11 @@ msgstr "Plattform:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Grafik" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "GFX" @@ -367,7 +368,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "жverskrid globala grafikinstфllningar" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Ljud" @@ -380,11 +381,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "жverskrid globala ljudinstфllningar" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Volym" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "Volym" @@ -398,7 +399,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "жverskrid globala volyminstфllningar" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -411,7 +412,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "жverskrid globala MIDI-instфllningar" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -424,11 +425,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "жverskrid globala MT-32 instфllningar" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Sіkvфgar" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Sіkvфgar" @@ -442,7 +443,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Sіkv. spel:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Sіkv. extra:" @@ -450,42 +451,42 @@ msgstr "Sіkv. extra:" msgid "Specifies path to additional data used by the game" msgstr "Bestфmmer sіkvфgen till ytterligare data som spelet anvфnder" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Sіkv. extra:" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Sіkv. sparat:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Bestфmmer var dina spardata lagras" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Sіkv. sparat:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Ingen" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "Vфlj SoundFont" @@ -497,7 +498,7 @@ msgstr "Vфlj katalog med speldata" msgid "Select additional game directory" msgstr "Vфlj en ytterligare spelkatalog" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Vфlj katalog fіr spardata" @@ -692,132 +693,132 @@ msgstr "Vфxla till spelet" msgid "Fast replay" msgstr "Snabb uppspelning" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Aldrig" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "var 5:e minut" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "var 10:e minut" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "var 15:e minut" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "var 30:e minut" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Kunde inte verkstфlla nхgra av grafikinstфllningarna:" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "videolфget kunde inte фndras." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "fullskфrmsinstфllningen kunde inte фndras." -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "instфllningen fіr bildfіrhхllandet kunde inte фndras." -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Grafiklфge:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Renderingslфge:" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Speciella gitterlфgen stіdda av vissa spel" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "Fullskфrmslфge" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Korrektion av bildfіrhхllande" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "Korrigerar bildfіrhхllanden fіr 320x200-spel" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Fіredragen enhet:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Musikenhet:" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "Bestфmmer din fіredragna emulator fіr ljudenhet eller ljudkort" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "Bestфmmer emulator fіr ljudenhet eller ljudkort" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Fіredr. enhet:" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Musikenhet:" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "AdLib-emulator:" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "AdLib anvфnds fіr musik i mхnga spel" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "Ljudfrekvens:" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -825,65 +826,65 @@ msgstr "" "Ett hіgre vфrde betecknar bфttre ljudkvalitet men stіds kanske inte av ditt " "ljudkort" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "GM-enhet:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "Bestфmmer standardenheten fіr General MIDI-uppspelning" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "Anvфnd inte General MIDI-musik" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "Anvфnd fіrsta tillgфngliga enhet" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "SoundFont stіds endast av vissa ljudkort, FluidSynth och Timidity" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "Blandat AdLib/MIDI-lфge" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "Anvфnd bхde MIDI och AdLib fіr ljudgeneration" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "FluidSynth instфllningar" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "MT-32 enhet:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Bestфmmer standardenheten fіr Roland MT-32/LAPC1/CM32I/CM64-uppspelning" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Фkta Roland MT-32 (inaktivera GM-emulation)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -891,16 +892,16 @@ msgstr "" "Aktivera om du vill anvфnda din verkliga Roland-kompatibla och dator-" "anslutna ljudenhet" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Фkta Roland MT-32 (ingen GM-emulation)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS-enhet (aktivera MT-32 mappings)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -908,171 +909,183 @@ msgstr "" "Aktivera om du vill anvфnda patch mapping fіr att emulera en MT-32 pх en " "Roland GS-enhet" -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "Anvфnd inte Roland MT-32 musik" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Undertext och tal:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Tal" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Undertexter" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Bхda" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Texthastighet:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text och tal:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Tal" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Text" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "Bхda" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Visa undertexter och spela upp tal" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Texthastighet:" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Musikvolym:" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Musikvolym:" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Ljud av" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "SFX-volym:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Volym fіr specialeffekter" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX-volym:" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Talvolym:" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Talvolym:" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Sіkv. tema:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Sіkv. tema:" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Bestфmmer sіkvфg till andra data som anvфnds av alla spel eller ScummVM" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Sіkv. tillфgg:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Sіkv. tillфgg:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Diverse" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "GUI-rendering:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Autospara:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Autospara:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Tangenter" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "GUI-sprхk:" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "Sprхk fіr ScummVM:s anvфndargrфnssnitt" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Du mхste starta om ScummVM fіr att фndringarna ska fх effekt." -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "" "Det gхr inte att skriva till den valda katalogen. Var god vфlj en annan." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Vфlj katalog fіr GUI-teman" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Vфlj katalog fіr extra filer" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Vфlj katalog fіr tillфgg" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1245,39 +1258,60 @@ msgstr "Antialiserad rendering" msgid "Antialiased" msgstr "Antialiserad" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "" + +#: gui/updates-dialog.cpp:92 +#, fuzzy +msgid "Check for updates automatically" +msgstr "Sіk efter uppdateringar..." + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Tіm sіkfфltet" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Motorn stіder inte debug-nivх '%s'" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Meny" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Skippa" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Paus" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Skippa rad" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Fel under kіrning av spel:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "Kunde inte hitta en motor kapabel till att kіra det valda spelet" @@ -1372,6 +1406,23 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Herkules bфrnsten" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "" + +#: common/updates.cpp:64 +#, fuzzy +msgid "<Bad value>" +msgstr "Tіm sіkfфltet" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2308,7 +2359,7 @@ msgstr "" "Glіm inte att vфlja en tangent fіr \"Gіm verktygsrad\" fіr att se hela " "inventariet" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "Sіk efter uppdateringar..." @@ -2877,6 +2928,15 @@ msgid "" msgstr "" "Anvфnd de alternativa silverpekarna istфllet fіr de normala guldpekarna" +#: engines/scumm/detection.cpp:1335 +#, fuzzy +msgid "Show Object Line" +msgstr "Visa etiketter" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/po/uk_UA.po b/po/uk_UA.po index fd7aae13d5..5b4f3078ec 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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\n" "PO-Revision-Date: 2015-11-06 10:07+0300\n" "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n" "Language-Team: Ukrainian\n" @@ -56,10 +56,11 @@ msgstr "Вгору" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -173,7 +174,7 @@ msgstr "Синусоїда" msgid "Triangle" msgstr "Трикутник" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Різне" @@ -207,7 +208,7 @@ msgstr "Скинути всі налаштування FluidSynth до їх значень за замовченням" #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -242,15 +243,15 @@ msgstr "Закрити" msgid "Mouse click" msgstr "Клік мишкою" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Показати клавіатуру" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Перепризначити клавіші" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "Перемкнути повноекранний режим" @@ -326,8 +327,8 @@ msgstr "" "Мова гри. Зміна цього налаштування не перетворить гру англійською на " "українську" -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<за умовчанням>" @@ -349,11 +350,11 @@ msgstr "Платформа:" msgid "Engine" msgstr "Движок" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Графіка" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "Грф" @@ -366,7 +367,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Перекрити глобальні установки графіки" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Аудіо" @@ -379,11 +380,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Перекрити глобальні установки аудіо" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Гучність" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "Гучн." @@ -397,7 +398,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Перекрити глобальні установки гучності" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -410,7 +411,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Перекрити глобальні установки MIDI" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -423,11 +424,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Перекрити глобальні установки MT-32" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Шляхи" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Шляхи" @@ -441,7 +442,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Шлях до гри:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Додатк. шлях:" @@ -449,42 +450,42 @@ msgstr "Додатк. шлях:" msgid "Specifies path to additional data used by the game" msgstr "Вказує шлях до додаткових файлів даних для гри" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Дод. шлях:" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Шлях збер.:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Вказує шлях до збережень гри" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Шлях збер.:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Не завданий" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "За умовчанням" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "Виберіть SoundFont" @@ -496,7 +497,7 @@ msgstr "Виберіть папку з файлами гри" msgid "Select additional game directory" msgstr "Виберіть додаткову папку гри" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Виберіть папку для збережень" @@ -690,132 +691,132 @@ msgstr "Переключитися на гру" msgid "Fast replay" msgstr "Швидке відтворення" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Ніколи" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "кожні 5 хв" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "кожні 10 хв" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "кожні 15 хв" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "кожні 30 хв" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 кГц" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 кГц" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 кГц" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 кГц" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 кГц" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Не заданий" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Не вдалося застосувати деякі зі змін графічних налаштувань:" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "не вдалося змінити графічний режим." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "не вдалося змінити режим повного екрану" -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "не вдалося змінити режим корекції співвідношення сторін" -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Графічн. режим:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Режим раструв.:" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Спеціальні режими растрування, які підтримують деякі ігри" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "Повноекранний режим" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Корекція співвідношення сторін" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "Коригувати співвідношення сторін для ігор з графікою 320x200" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Уподобаний пристрій:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Музич. пристрій:" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "Вказує уподобаний звуковий пристрій або емулятор звукової карти" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "Вказує вихідний звуковий пристрій або емулятор звукової карти" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Уподоб. пристрій:" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Музичний пристрій:" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "Емулятор AdLib:" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "Звукова карта AdLib використовується багатьма іграми" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "Вихідна частота:" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -823,67 +824,67 @@ msgstr "" "Великі значення задають кращу якість звуку, проте вони можуть не " "підтримуватися вашою звуковою картою" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "Пристрій GM:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "Вказує вихідний звуковий пристрій для General MIDI" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "Не використовувати музику General MIDI" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "Використовувати перший наявний пристрій" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "SoundFont підтримується деякими звуковими картами, FluidSynth та Timidity" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "Змішаний режим AdLib/MIDI" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "Використовувати і MIDI і AdLib для генерації звуку" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "Посилення MIDI:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "Налаштування FluidSynth" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "Пристрій MT-32:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Вказує звуковий пристрій за умовчанням для виводу на Roland MT-32/LAPC1/" "CM32l/CM64" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Справжній Roland MT-32 (вимкнути емуляцию GM)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -891,16 +892,16 @@ msgstr "" "Відмітьте, якщо у вас підключено Roland-сумісний звуковий пристрій і ви " "хочете його використовувати" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Справжній Roland MT-32 (вимкнути емуляцию GM)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Режим Roland GS (ввімкнути маплення MT-32)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -908,171 +909,183 @@ msgstr "" "Відмітьте, якщо хочете включити латки для іструментів для емуляції MT-32 на " "Roland" -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "Не використовувати музику для Roland MT-32" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Текст і озвучка:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Озвучка" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Субтитри" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Все" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Швид. субтитрів:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Текст і озвучка:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Озв" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Суб" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "Все" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Показувати субтитри і відтворювати мову" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Швид. субтитрів:" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Гучність музики:" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Гучність музики:" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Вимкнути все" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "Гучність ефектів:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Гучність спеціальних звукових ефектів" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "Гучн. ефектів:" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Гучність озвучки:" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Гучн. озвучки:" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Шлях до тем:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Шлях до тем:" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Вказує шлях до додаткових файлів даних, які використовуються усіма іграми " "або ScummVM" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Шлях до втулків:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Шлях до втулків:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Різне" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Тема:" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "Растер. GUI:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Автозбереження:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Автозбереж.:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Клавіші" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "Мова інтерф.:" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "Мова графічного інтерфейсу ScummVM" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "Перевіряти оновлення:" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "Як часто перевіряти оновлення ScummVM" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "Перевірити зараз" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Ви повинні перезапустити ScummVM щоб застосувати зміни." -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Не можу писати у вибрану папку. Будь ласка, вкажіть іншу." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Виберіть папку для тем GUI" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Виберіть папку з додатковими файлами" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Виберіть папку зі втулками" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1245,39 +1258,63 @@ msgstr "Растеризатор зі згладжуванням" msgid "Antialiased" msgstr "Зі згладжуванням" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" +"ScummVM став підтримувати автоматичну перевірку\n" +"оновлень, що потребує досупу до Інтернету.\n" +"\n" +"Чи хотіли б ви включити таку перевірку?" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "(Ви завжди можете включити її у Налаштуваннях на закладці Інше)" + +#: gui/updates-dialog.cpp:92 +msgid "Check for updates automatically" +msgstr "Автоматычно перевіряти оновлення" + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "Продовжити" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Очистити значення" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Движок не підтримує рівень відладки '%s'" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Меню" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Пропустити" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Пауза" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Пропустити рядок" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Помилка запуску гри:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "Не можу знайти движок для запуску вибраної гри" @@ -1372,6 +1409,22 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules бурштинний" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "Щоденно" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "Щотижня" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "Щомісяця" + +#: common/updates.cpp:64 +msgid "<Bad value>" +msgstr "<Невірне значення>" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2306,7 +2359,7 @@ msgstr "" "Не забудьте перепризначити кнопку для дії 'Сховати Панель інстр.' щоб " "побачити весь інвентар" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "Перевірити оновлення..." @@ -2659,11 +2712,11 @@ msgstr "" #: engines/mohawk/detection.cpp:168 msgid "Play the Myst fly by movie" -msgstr "" +msgstr "Показувати ролік польоту над Myst" #: engines/mohawk/detection.cpp:169 msgid "The Myst fly by movie was not played by the original engine." -msgstr "" +msgstr "Ролік польоту над Myst не показувався оригінальним движком" #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:96 engines/mohawk/dialogs.cpp:239 @@ -2874,6 +2927,14 @@ msgstr "" "Використовувати альтернативний набір срібних курсорів, замість звичайних " "золотих" +#: engines/scumm/detection.cpp:1335 +msgid "Show Object Line" +msgstr "Показувати лінії об'єктів" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "Показувати назви об'єктив внизу екрану" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/po/zh-Latn_CN.po b/po/zh-Latn_CN.po index 02f8df1b46..d90a6ba715 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-04-01 19:18+0200\n" +"POT-Creation-Date: 2016-04-07 08:55+0100\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" @@ -54,10 +54,11 @@ msgstr "ShangYiJi" #: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editrecorddialog.cpp:67 #: gui/filebrowser-dialog.cpp:64 gui/fluidsynth-dialog.cpp:152 #: gui/KeysDialog.cpp:43 gui/launcher.cpp:351 gui/massadd.cpp:95 -#: gui/options.cpp:1237 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 +#: gui/options.cpp:1255 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:70 #: gui/recorderdialog.cpp:156 gui/saveload-dialog.cpp:216 #: gui/saveload-dialog.cpp:276 gui/saveload-dialog.cpp:547 -#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 engines/engine.cpp:546 +#: gui/saveload-dialog.cpp:931 gui/themebrowser.cpp:55 +#: gui/updates-dialog.cpp:113 engines/engine.cpp:546 #: backends/events/default/default-events.cpp:196 #: backends/events/default/default-events.cpp:218 #: backends/platform/wii/options.cpp:48 engines/drascula/saveload.cpp:49 @@ -171,7 +172,7 @@ msgstr "Zhengxian" msgid "Triangle" msgstr "Sanjiaoxing" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1168 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1170 msgid "Misc" msgstr "Zaxiang" @@ -205,7 +206,7 @@ msgstr "Chongzhi Suoyou de FluidSynth Shezhi" #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:352 #: gui/launcher.cpp:1050 gui/launcher.cpp:1054 gui/massadd.cpp:92 -#: gui/options.cpp:1238 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 +#: gui/options.cpp:1256 gui/saveload-dialog.cpp:932 engines/engine.cpp:465 #: engines/engine.cpp:476 backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49 @@ -238,15 +239,15 @@ msgstr "Guanbi" msgid "Mouse click" msgstr "Shubiao Danji" -#: gui/gui-manager.cpp:126 base/main.cpp:322 +#: gui/gui-manager.cpp:126 base/main.cpp:325 msgid "Display keyboard" msgstr "Xianshi Jianpan" -#: gui/gui-manager.cpp:130 base/main.cpp:326 +#: gui/gui-manager.cpp:130 base/main.cpp:329 msgid "Remap keys" msgstr "Yingshe Jianwei" -#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87 +#: gui/gui-manager.cpp:133 base/main.cpp:332 engines/scumm/help.cpp:87 msgid "Toggle fullscreen" msgstr "Quanping Qiehuan" @@ -321,8 +322,8 @@ msgid "" msgstr "" "Youxi de Yuyan. CiXiang buhui jiang Yige XibanyaYu Banben Zhuancheng Yingwen" -#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:87 -#: gui/options.cpp:735 gui/options.cpp:748 gui/options.cpp:1208 +#: gui/launcher.cpp:212 gui/launcher.cpp:226 gui/options.cpp:89 +#: gui/options.cpp:737 gui/options.cpp:750 gui/options.cpp:1210 #: audio/null.cpp:41 msgid "<default>" msgstr "<Moren>" @@ -344,11 +345,11 @@ msgstr "Pingtai:" msgid "Engine" msgstr "Yinqing" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "Graphics" msgstr "Tuxiang" -#: gui/launcher.cpp:245 gui/options.cpp:1071 gui/options.cpp:1088 +#: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090 msgid "GFX" msgstr "GFX" @@ -361,7 +362,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Fugai Quanju Tuxiang Shezhi" -#: gui/launcher.cpp:257 gui/options.cpp:1094 +#: gui/launcher.cpp:257 gui/options.cpp:1096 msgid "Audio" msgstr "Yinpin" @@ -374,11 +375,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Fugai QUanju Yinpin Shezhi" -#: gui/launcher.cpp:271 gui/options.cpp:1099 +#: gui/launcher.cpp:271 gui/options.cpp:1101 msgid "Volume" msgstr "Yinliang" -#: gui/launcher.cpp:273 gui/options.cpp:1101 +#: gui/launcher.cpp:273 gui/options.cpp:1103 msgctxt "lowres" msgid "Volume" msgstr "YinLiang" @@ -392,7 +393,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Fugai Quanju YinLiang Shezhi" -#: gui/launcher.cpp:286 gui/options.cpp:1109 +#: gui/launcher.cpp:286 gui/options.cpp:1111 msgid "MIDI" msgstr "MIDI" @@ -405,7 +406,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Fugai Quanju MIDI Shezhi" -#: gui/launcher.cpp:300 gui/options.cpp:1115 +#: gui/launcher.cpp:300 gui/options.cpp:1117 msgid "MT-32" msgstr "MT-32" @@ -418,11 +419,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Fugai Quanju MT-32 Shezhi" -#: gui/launcher.cpp:314 gui/options.cpp:1122 +#: gui/launcher.cpp:314 gui/options.cpp:1124 msgid "Paths" msgstr "Lujing" -#: gui/launcher.cpp:316 gui/options.cpp:1124 +#: gui/launcher.cpp:316 gui/options.cpp:1126 msgctxt "lowres" msgid "Paths" msgstr "Lujing" @@ -436,7 +437,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Youxi Lujing:" -#: gui/launcher.cpp:330 gui/options.cpp:1148 +#: gui/launcher.cpp:330 gui/options.cpp:1150 msgid "Extra Path:" msgstr "Qita Lujing:" @@ -444,42 +445,42 @@ msgstr "Qita Lujing:" msgid "Specifies path to additional data used by the game" msgstr "Zhiding Youxi Suoyong de Shuju de Cunfang Lujing" -#: gui/launcher.cpp:332 gui/options.cpp:1150 +#: gui/launcher.cpp:332 gui/options.cpp:1152 msgctxt "lowres" msgid "Extra Path:" msgstr "Qita Lujing:" -#: gui/launcher.cpp:339 gui/options.cpp:1132 +#: gui/launcher.cpp:339 gui/options.cpp:1134 msgid "Save Path:" msgstr "Baocun Lujing:" #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342 -#: gui/options.cpp:1132 gui/options.cpp:1134 gui/options.cpp:1135 +#: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137 msgid "Specifies where your saved games are put" msgstr "Zhiding Nin Jiang Youxi Baocun Zai le Nali" -#: gui/launcher.cpp:341 gui/options.cpp:1134 +#: gui/launcher.cpp:341 gui/options.cpp:1136 msgctxt "lowres" msgid "Save Path:" msgstr "Baocun Lujing:" #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517 -#: gui/launcher.cpp:571 gui/options.cpp:1143 gui/options.cpp:1151 -#: gui/options.cpp:1160 gui/options.cpp:1275 gui/options.cpp:1281 -#: gui/options.cpp:1289 gui/options.cpp:1319 gui/options.cpp:1325 -#: gui/options.cpp:1332 gui/options.cpp:1425 gui/options.cpp:1428 -#: gui/options.cpp:1440 +#: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153 +#: gui/options.cpp:1162 gui/options.cpp:1293 gui/options.cpp:1299 +#: gui/options.cpp:1307 gui/options.cpp:1337 gui/options.cpp:1343 +#: gui/options.cpp:1350 gui/options.cpp:1456 gui/options.cpp:1459 +#: gui/options.cpp:1471 msgctxt "path" msgid "None" msgstr "Wu" #: gui/launcher.cpp:365 gui/launcher.cpp:465 gui/launcher.cpp:575 -#: gui/options.cpp:1269 gui/options.cpp:1313 gui/options.cpp:1431 +#: gui/options.cpp:1287 gui/options.cpp:1331 gui/options.cpp:1462 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Moren" -#: gui/launcher.cpp:510 gui/options.cpp:1434 +#: gui/launcher.cpp:510 gui/options.cpp:1465 msgid "Select SoundFont" msgstr "Xuanze SoundFont" @@ -491,7 +492,7 @@ msgstr "Xuanze Youxi Shuju Mulu" msgid "Select additional game directory" msgstr "Xuanze Qita Youxi Mulu" -#: gui/launcher.cpp:559 gui/options.cpp:1377 +#: gui/launcher.cpp:559 gui/options.cpp:1408 msgid "Select directory for saved games" msgstr "Xuanze Youxi Baocun Mulu" @@ -685,132 +686,132 @@ msgstr "Qiehuan zhi Youxi" msgid "Fast replay" msgstr "Kuaisu Huitui" -#: gui/options.cpp:85 +#: gui/options.cpp:87 common/updates.cpp:56 msgid "Never" msgstr "Yongbu" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 5 mins" msgstr "Mei 5 Fenzhong" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 10 mins" msgstr "Mei 10 Fenzhong" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 15 mins" msgstr "Mei 15 Fenzhong" -#: gui/options.cpp:85 +#: gui/options.cpp:87 msgid "every 30 mins" msgstr "Mei 30 Fenzhong" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "8 kHz" msgstr "8 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "11 kHz" msgstr "11 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "22 kHz" msgstr "22 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "44 kHz" msgstr "44 kHz" -#: gui/options.cpp:87 +#: gui/options.cpp:89 msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:255 gui/options.cpp:479 gui/options.cpp:580 -#: gui/options.cpp:649 gui/options.cpp:857 +#: gui/options.cpp:257 gui/options.cpp:481 gui/options.cpp:582 +#: gui/options.cpp:651 gui/options.cpp:859 msgctxt "soundfont" msgid "None" msgstr "Wu" -#: gui/options.cpp:389 +#: gui/options.cpp:391 msgid "Failed to apply some of the graphic options changes:" msgstr "Tuxing Xuanxiang Genggai Shibai:" -#: gui/options.cpp:401 +#: gui/options.cpp:403 msgid "the video mode could not be changed." msgstr "Shipin Moshi Wufa Genggai." -#: gui/options.cpp:407 +#: gui/options.cpp:409 msgid "the fullscreen setting could not be changed" msgstr "Quanping Shezhi Wufa Genggai" -#: gui/options.cpp:413 +#: gui/options.cpp:415 msgid "the aspect ratio setting could not be changed" msgstr "Bili Xuanxiang Wufa Genggai" -#: gui/options.cpp:732 +#: gui/options.cpp:734 msgid "Graphics mode:" msgstr "Tuxing Moshi:" -#: gui/options.cpp:746 +#: gui/options.cpp:748 msgid "Render mode:" msgstr "Xuanran Moshi:" -#: gui/options.cpp:746 gui/options.cpp:747 +#: gui/options.cpp:748 gui/options.cpp:749 msgid "Special dithering modes supported by some games" msgstr "Youxi Zhichi Teshu de Doudong Moshi" -#: gui/options.cpp:758 +#: gui/options.cpp:760 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2316 msgid "Fullscreen mode" msgstr "Quanping Moshi" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Aspect ratio correction" msgstr "Bili Jiaozheng" -#: gui/options.cpp:761 +#: gui/options.cpp:763 msgid "Correct aspect ratio for 320x200 games" msgstr "320x200 Youxi Bili Jiaozheng" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Preferred Device:" msgstr "Youxian Shebei:" -#: gui/options.cpp:769 +#: gui/options.cpp:771 msgid "Music Device:" msgstr "Yinyue Shebei:" -#: gui/options.cpp:769 gui/options.cpp:771 +#: gui/options.cpp:771 gui/options.cpp:773 msgid "Specifies preferred sound device or sound card emulator" msgstr "Zhiding Youxian Shengyin Shebei huo Shengka Moniqi" -#: gui/options.cpp:769 gui/options.cpp:771 gui/options.cpp:772 +#: gui/options.cpp:771 gui/options.cpp:773 gui/options.cpp:774 msgid "Specifies output sound device or sound card emulator" msgstr "Zhiding Shuchu Shengyin Shebei huo Shengka Moniqi" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Youxian Shebei:" -#: gui/options.cpp:771 +#: gui/options.cpp:773 msgctxt "lowres" msgid "Music Device:" msgstr "Yinyue Shebei:" -#: gui/options.cpp:798 +#: gui/options.cpp:800 msgid "AdLib emulator:" msgstr "AdLib Moniqi:" -#: gui/options.cpp:798 gui/options.cpp:799 +#: gui/options.cpp:800 gui/options.cpp:801 msgid "AdLib is used for music in many games" msgstr "AdLib bei Henduo Youxi Yonglai Bofang Yinyue" -#: gui/options.cpp:809 +#: gui/options.cpp:811 msgid "Output rate:" msgstr "Shuchu Malv:" -#: gui/options.cpp:809 gui/options.cpp:810 +#: gui/options.cpp:811 gui/options.cpp:812 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -818,66 +819,66 @@ msgstr "" "Genggao de Shuxing Hui Tisheng Yinyue Zhiliang dan Youkeneng Nin de Shengka " "Buzhichi" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "GM Device:" msgstr "GM Shebei:" -#: gui/options.cpp:820 +#: gui/options.cpp:822 msgid "Specifies default sound device for General MIDI output" msgstr "Zhiding Tongyong MIDI Shuchu Moren Shengyin Shebei" -#: gui/options.cpp:831 +#: gui/options.cpp:833 msgid "Don't use General MIDI music" msgstr "Buyao Shiyong Tongyong MIDI Yinyue" -#: gui/options.cpp:842 gui/options.cpp:908 +#: gui/options.cpp:844 gui/options.cpp:910 msgid "Use first available device" msgstr "Shiyong Diyige keyong de Shebei" -#: gui/options.cpp:854 +#: gui/options.cpp:856 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:854 gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:856 gui/options.cpp:858 gui/options.cpp:859 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "Yixie Shengka Zhichi SoundFont, Biru FluidSynth He Timidity" -#: gui/options.cpp:856 +#: gui/options.cpp:858 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Mixed AdLib/MIDI mode" msgstr "Hunhe AdLib/MIDI Moshi" -#: gui/options.cpp:862 +#: gui/options.cpp:864 msgid "Use both MIDI and AdLib sound generation" msgstr "TongShi Shiyong MIDI He AdLib Shengyin Shengcheng" -#: gui/options.cpp:865 +#: gui/options.cpp:867 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:872 +#: gui/options.cpp:874 msgid "FluidSynth Settings" msgstr "FluidSynth Xuanxiang" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "MT-32 Device:" msgstr "MT-32 Shebei:" -#: gui/options.cpp:879 +#: gui/options.cpp:881 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "QIng Zhiding Yongyu Roland MT-32/LAPC1/CM32I/CM64 Shuchu de Moren Shengyin " "Shebei" -#: gui/options.cpp:884 +#: gui/options.cpp:886 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Zhen Roland MT-32 (Jinyong GM Moni)" -#: gui/options.cpp:884 gui/options.cpp:886 +#: gui/options.cpp:886 gui/options.cpp:888 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -885,16 +886,16 @@ msgstr "" "Jiancha Shifou Nin Xiang Shiyong Lianjie Dao Jisuanji de Zhenshi de Yingjian " "Roland Jianrong Shengyin Shebei" -#: gui/options.cpp:886 +#: gui/options.cpp:888 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Zhen Roland MT-32 Shebei (Wu GM Moni)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS Shebei (Qiyong MT-32 Yingshe)" -#: gui/options.cpp:889 +#: gui/options.cpp:891 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -902,169 +903,181 @@ msgstr "" "Jiancha Shifou Nin Xiang Qiyong patch Yingshe Lai Zai Roland GS Shebei " "Shangmian Moni MT-32" -#: gui/options.cpp:898 +#: gui/options.cpp:900 msgid "Don't use Roland MT-32 music" msgstr "Buyao Shiyong Roland MT-32 Yinyue" -#: gui/options.cpp:925 +#: gui/options.cpp:927 msgid "Text and Speech:" msgstr "Wenzi he Yuyin:" -#: gui/options.cpp:929 gui/options.cpp:939 +#: gui/options.cpp:931 gui/options.cpp:941 msgid "Speech" msgstr "Yuyin" -#: gui/options.cpp:930 gui/options.cpp:940 +#: gui/options.cpp:932 gui/options.cpp:942 msgid "Subtitles" msgstr "Zimu" -#: gui/options.cpp:931 +#: gui/options.cpp:933 msgid "Both" msgstr "Liangzhe" -#: gui/options.cpp:933 +#: gui/options.cpp:935 msgid "Subtitle speed:" msgstr "Zimu Sudu:" -#: gui/options.cpp:935 +#: gui/options.cpp:937 msgctxt "lowres" msgid "Text and Speech:" msgstr "Wenben he Yuyin:" -#: gui/options.cpp:939 +#: gui/options.cpp:941 msgid "Spch" msgstr "Zimu" -#: gui/options.cpp:940 +#: gui/options.cpp:942 msgid "Subs" msgstr "Yuyin" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgctxt "lowres" msgid "Both" msgstr "Dou" -#: gui/options.cpp:941 +#: gui/options.cpp:943 msgid "Show subtitles and play speech" msgstr "Xianshi Zimu Bing Bofang Yuyin" -#: gui/options.cpp:943 +#: gui/options.cpp:945 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Zimu Sudu" -#: gui/options.cpp:959 +#: gui/options.cpp:961 msgid "Music volume:" msgstr "Yinyue Yinliang:" -#: gui/options.cpp:961 +#: gui/options.cpp:963 msgctxt "lowres" msgid "Music volume:" msgstr "Yinyue Yinliang:" -#: gui/options.cpp:968 +#: gui/options.cpp:970 msgid "Mute All" msgstr "Quanbu Jinyin" -#: gui/options.cpp:971 +#: gui/options.cpp:973 msgid "SFX volume:" msgstr "Yinxiao Yinliang:" -#: gui/options.cpp:971 gui/options.cpp:973 gui/options.cpp:974 +#: gui/options.cpp:973 gui/options.cpp:975 gui/options.cpp:976 msgid "Special sound effects volume" msgstr "Texiao Yinliang" -#: gui/options.cpp:973 +#: gui/options.cpp:975 msgctxt "lowres" msgid "SFX volume:" msgstr "Yinxiao Yinliang:" -#: gui/options.cpp:981 +#: gui/options.cpp:983 msgid "Speech volume:" msgstr "Yuyin Yinliang:" -#: gui/options.cpp:983 +#: gui/options.cpp:985 msgctxt "lowres" msgid "Speech volume:" msgstr "Yuyin Yinliang:" -#: gui/options.cpp:1140 +#: gui/options.cpp:1142 msgid "Theme Path:" msgstr "Zhuti Lujing:" -#: gui/options.cpp:1142 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "Theme Path:" msgstr "Zhuti Lujing:" -#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151 +#: gui/options.cpp:1150 gui/options.cpp:1152 gui/options.cpp:1153 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "Zhiding Suoyou Youxi huo ScummVM de Shuju Lujing" -#: gui/options.cpp:1157 +#: gui/options.cpp:1159 msgid "Plugins Path:" msgstr "Chajian Lujing:" -#: gui/options.cpp:1159 +#: gui/options.cpp:1161 msgctxt "lowres" msgid "Plugins Path:" msgstr "Chajian Lujing:" -#: gui/options.cpp:1170 +#: gui/options.cpp:1172 msgctxt "lowres" msgid "Misc" msgstr "Zaxiang" -#: gui/options.cpp:1172 +#: gui/options.cpp:1174 msgid "Theme:" msgstr "Zhuti:" -#: gui/options.cpp:1176 +#: gui/options.cpp:1178 msgid "GUI Renderer:" msgstr "Jiemian Xuanran:" -#: gui/options.cpp:1188 +#: gui/options.cpp:1190 msgid "Autosave:" msgstr "Zidong Baocun:" -#: gui/options.cpp:1190 +#: gui/options.cpp:1192 msgctxt "lowres" msgid "Autosave:" msgstr "Zidong Baocun:" -#: gui/options.cpp:1198 +#: gui/options.cpp:1200 msgid "Keys" msgstr "Guanjianzi" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "GUI Language:" msgstr "Jiemian Yuyan:" -#: gui/options.cpp:1205 +#: gui/options.cpp:1207 msgid "Language of ScummVM GUI" msgstr "ScummVM Jiemian Yuyan" -#: gui/options.cpp:1364 +#: gui/options.cpp:1235 +msgid "Update check:" +msgstr "" + +#: gui/options.cpp:1235 +msgid "How often to check ScummVM updates" +msgstr "" + +#: gui/options.cpp:1247 +msgid "Check now" +msgstr "" + +#: gui/options.cpp:1382 msgid "You have to restart ScummVM before your changes will take effect." msgstr "Nin Xuyao Chongqi ScummVM Lai Shi Genggai Shengxiao" -#: gui/options.cpp:1384 +#: gui/options.cpp:1415 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Zhiding de Mulu Buneng Xieru. Qing Xuanze Qita de Mulu." -#: gui/options.cpp:1393 +#: gui/options.cpp:1424 msgid "Select directory for GUI themes" msgstr "Xuanze Jiemian Zhuti de Mulu" -#: gui/options.cpp:1403 +#: gui/options.cpp:1434 msgid "Select directory for extra files" msgstr "Xuanze QIta Wenjian Mulu" -#: gui/options.cpp:1414 +#: gui/options.cpp:1445 msgid "Select directory for plugins" msgstr "Xuanze Chajian Mulu" -#: gui/options.cpp:1467 +#: gui/options.cpp:1498 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1237,39 +1250,60 @@ msgstr "Fanjuchi Xuanranqi" msgid "Antialiased" msgstr "Fanjuchi" -#: gui/widget.cpp:325 gui/widget.cpp:327 gui/widget.cpp:333 gui/widget.cpp:335 +#: gui/updates-dialog.cpp:51 +msgid "" +"ScummVM now supports automatic check for updates\n" +"which requires access to the Internet.\n" +"\n" +"Would you like to enable this feature?" +msgstr "" + +#: gui/updates-dialog.cpp:55 +msgid "(You can always enable it in the options dialog on the Misc tab)" +msgstr "" + +#: gui/updates-dialog.cpp:92 +#, fuzzy +msgid "Check for updates automatically" +msgstr "Jiancha Gengxin..." + +#: gui/updates-dialog.cpp:111 +msgid "Proceed" +msgstr "" + +#: gui/widget.cpp:327 gui/widget.cpp:329 gui/widget.cpp:335 gui/widget.cpp:337 msgid "Clear value" msgstr "Qingchu Zhi" -#: base/main.cpp:237 +#: base/main.cpp:240 #, c-format msgid "Engine does not support debug level '%s'" msgstr "Yinqing Buzhichi Tiaoshi Jibie т%sт" -#: base/main.cpp:309 +#: base/main.cpp:312 msgid "Menu" msgstr "Caidan" -#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Tiaoguo" -#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:318 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Zanting" -#: base/main.cpp:318 +#: base/main.cpp:321 msgid "Skip line" msgstr "Tiaoguo Cihang" -#: base/main.cpp:510 +#: base/main.cpp:520 msgid "Error running game:" msgstr "Youxi Yunxing Cuowu:" -#: base/main.cpp:557 +#: base/main.cpp:567 msgid "Could not find any engine capable of running the selected game" msgstr "Wufa Zhaodao Shihe Yunxing Youxi de Yinqing" @@ -1364,6 +1398,23 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "Hercules Amber" +#: common/updates.cpp:58 +msgid "Daily" +msgstr "" + +#: common/updates.cpp:60 +msgid "Weekly" +msgstr "" + +#: common/updates.cpp:62 +msgid "Monthly" +msgstr "" + +#: common/updates.cpp:64 +#, fuzzy +msgid "<Bad value>" +msgstr "Qingchu Zhi" + #: engines/advancedDetector.cpp:334 #, c-format msgid "The game in '%s' seems to be unknown." @@ -2295,7 +2346,7 @@ msgstr "" "Buyao Wnagji Yingshe YIge Jian Dao 'YIncang Gongjulan' Lai Chakan Suoyou " "xiang" -#: backends/updates/macosx/macosx-updates.mm:67 +#: backends/updates/macosx/macosx-updates.mm:68 msgid "Check for Updates..." msgstr "Jiancha Gengxin..." @@ -2855,6 +2906,15 @@ msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "Shiyong Qita Yinse Guangbiao" +#: engines/scumm/detection.cpp:1335 +#, fuzzy +msgid "Show Object Line" +msgstr "Xianshi Wuti Biaoqian" + +#: engines/scumm/detection.cpp:1336 +msgid "Show the names of objects at the bottom of the screen" +msgstr "" + #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Insert Disk %c and Press Button to Continue." diff --git a/video/mpegps_decoder.cpp b/video/mpegps_decoder.cpp index 6942efbe87..d2e9554c8f 100644 --- a/video/mpegps_decoder.cpp +++ b/video/mpegps_decoder.cpp @@ -21,7 +21,6 @@ */ #include "audio/audiostream.h" -#include "audio/decoders/raw.h" #include "audio/decoders/mp3.h" #include "common/debug.h" #include "common/endian.h" diff --git a/video/psx_decoder.cpp b/video/psx_decoder.cpp index 91f8e1dafc..4f14e2ea4f 100644 --- a/video/psx_decoder.cpp +++ b/video/psx_decoder.cpp @@ -24,7 +24,6 @@ // MDEC video emulation based on http://kenai.com/downloads/jpsxdec/Old/PlayStation1_STR_format1-00.txt #include "audio/audiostream.h" -#include "audio/mixer.h" #include "audio/decoders/raw.h" #include "common/bitstream.h" #include "common/huffman.h" |