[Scummvm-cvs-logs] scummvm master -> f11b52a097912cfc24728259150c00227167df38

wjp wjp at usecode.org
Sun Jan 29 16:28:09 CET 2012


This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
843b9f9665 GRAPHICS: Add a TTF font class using FreeType2.
d21ae1aa40 GUI: Add support for loading TTF files with ISO-8859-1 charset.
9f3fbe1bd7 GRAPHICS/GUI: Implement kerning support for Font.
f63df3bf7b GRAPHICS/GUI: Implement charset mapping for TTF fonts.
b0dfd08ff9 GUI: Fix anti-aliased font drawing of checkbox/radio button texts.
00cc48f83d GUI: Add GNU FreeFont TTFs for use with our modern theme.
f11b52a097 KYRA: Prevent unnecessary removal of const in some casts.


Commit: 843b9f96655feda8c78450d9236b09330bdb6bd1
    https://github.com/scummvm/scummvm/commit/843b9f96655feda8c78450d9236b09330bdb6bd1
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-01-29T07:26:20-08:00

Commit Message:
GRAPHICS: Add a TTF font class using FreeType2.

Changed paths:
  A graphics/fonts/ttf.cpp
  A graphics/fonts/ttf.h
    base/version.cpp
    configure
    graphics/module.mk



diff --git a/base/version.cpp b/base/version.cpp
index a068f2b..7943552 100644
--- a/base/version.cpp
+++ b/base/version.cpp
@@ -121,4 +121,8 @@ const char *gScummVMFeatures = ""
 #ifdef USE_FAAD
 	"AAC "
 #endif
+
+#ifdef USE_FREETYPE2
+	"FreeType2 "
+#endif
 	;
diff --git a/configure b/configure
index ab8259d..27f56da 100755
--- a/configure
+++ b/configure
@@ -145,6 +145,7 @@ _fluidsynth=auto
 _opengl=auto
 _opengles=auto
 _readline=auto
+_freetype2=auto
 _taskbar=yes
 _updates=no
 _libunity=auto
@@ -188,7 +189,9 @@ _win32path="c:/scummvm"
 _aos4path="Games:ScummVM"
 _staticlibpath=/sw
 _sdlconfig=sdl-config
+_freetypeconfig=freetype-config
 _sdlpath="$PATH"
+_freetypepath="$PATH"
 _nasmpath="$PATH"
 NASMFLAGS=""
 NASM=""
@@ -384,6 +387,40 @@ find_sdlconfig() {
 }
 
 #
+# Determine freetype-config
+#
+find_freetypeconfig() {
+	echo_n "Looking for freetype-config... "
+	freetypeconfigs="$_freetypeconfig"
+	_freetypeconfig=
+
+	IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="$SEPARATOR"
+	for path_dir in $_freetypepath; do
+		#reset separator to parse freetypeconfigs
+		IFS=":"
+		for freetypeconfig in $freetypeconfigs; do
+			if test -f "$path_dir/$freetypeconfig" ; then
+				_freetypeconfig="$path_dir/$freetypeconfig"
+				echo $_freetypeconfig
+				# Save the prefix
+				_freetypepath=$path_dir
+				if test `basename $path_dir` = bin ; then
+					_freetypepath=`dirname $path_dir`
+				fi
+				# break at first freetype-config found in path
+				break 2
+			fi
+		done
+	done
+
+	IFS="$ac_save_ifs"
+
+	if test -z "$_freetypeconfig"; then
+		echo "none found!"
+	fi
+}
+
+#
 # Determine extension used for executables
 #
 get_system_exe_extension() {
@@ -846,6 +883,9 @@ Optional Libraries:
   --with-sdl-prefix=DIR    Prefix where the sdl-config script is
                            installed (optional)
 
+  --with-freetype-prefix=DIR Prefix where the freetype-config script is
+                           installed (optional)
+
   --with-nasm-prefix=DIR   Prefix where nasm executable is installed (optional)
   --disable-nasm           disable assembly language optimizations [autodetect]
 
@@ -905,6 +945,8 @@ for ac_option in $@; do
 	--disable-fluidsynth)     _fluidsynth=no  ;;
 	--enable-readline)        _readline=yes   ;;
 	--disable-readline)       _readline=no    ;;
+	--enable-freetype2)       _freetype2=yes  ;;
+	--disable-freetype2)      _freetype2=no   ;;
 	--enable-taskbar)         _taskbar=yes    ;;
 	--disable-taskbar)        _taskbar=no     ;;
 	--enable-updates)         _updates=yes    ;;
@@ -1042,6 +1084,10 @@ for ac_option in $@; do
 		arg=`echo $ac_option | cut -d '=' -f 2`
 		_sdlpath="$arg:$arg/bin"
 		;;
+	--with-freetype2-prefix=*)
+		arg=`echo $ac_option | cut -d '=' -f 2`
+		_freetypepath="$arg:$arg/bin"
+		;;
 	--with-nasm-prefix=*)
 		arg=`echo $ac_option | cut -d '=' -f 2`
 		_nasmpath="$arg:$arg/bin"
@@ -3413,6 +3459,50 @@ fi
 echo "$_libunity"
 
 #
+# Check for FreeType2 to be present
+#
+if test "$_freetype2" != "no"; then
+
+	# Look for the freetype-config script
+	find_freetypeconfig
+
+	if test -z "$_freetypeconfig"; then
+		_freetype2=no
+	else
+		FREETYPE2_LIBS=`$_freetypeconfig --prefix="$_freetypepath" --libs`
+		FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$_freetypepath" --cflags`
+
+		if test "$_freetype2" = "auto"; then
+			_freetype2=no
+
+			cat > $TMPC << EOF
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+int main(int argc, char *argv[]) {
+	FT_Library library;
+	FT_Error error = FT_Init_FreeType(&library);
+	FT_Done_FreeType(library);
+}
+EOF
+
+			cc_check $FREETYPE2_CFLAGS $FREETYPE2_LIBS && _freetype2=yes
+		fi
+
+		if test "$_freetype2" = "yes"; then
+			LIBS="$LIBS $FREETYPE2_LIBS"
+			INCLUDES="$INCLUDES $FREETYPE2_CFLAGS"
+		fi
+	fi
+
+fi
+
+echocheck "FreeType2"
+echo "$_freetype2"
+
+define_in_config_h_if_yes "$_freetype2" "USE_FREETYPE2"
+
+#
 # Check for OpenGL (ES)
 #
 echocheck "OpenGL"
diff --git a/graphics/fonts/ttf.cpp b/graphics/fonts/ttf.cpp
new file mode 100644
index 0000000..8a6b87c
--- /dev/null
+++ b/graphics/fonts/ttf.cpp
@@ -0,0 +1,443 @@
+/* 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.
+ *
+ */
+
+// Since FreeType2 includes files, which contain forbidden symbols, we need to
+// allow all symbols here.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
+#include "common/scummsys.h"
+#ifdef USE_FREETYPE2
+
+#include "graphics/fonts/ttf.h"
+#include "graphics/font.h"
+#include "graphics/surface.h"
+
+#include "common/singleton.h"
+#include "common/stream.h"
+#include "common/hashmap.h"
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+
+namespace Graphics {
+
+namespace {
+
+inline int ftFloor26_6(FT_Pos x) {
+	return x / 64;
+}
+
+inline int ftCeil26_6(FT_Pos x) {
+	return (x + 63) / 64;
+}
+
+} // End of anonymous namespace
+
+class TTFLibrary : public Common::Singleton<TTFLibrary> {
+public:
+	TTFLibrary();
+	~TTFLibrary();
+
+	/**
+	 * Check whether FreeType2 is initialized properly.
+	 */
+	bool isInitialized() const { return _initialized; }
+
+	bool loadFont(const uint8 *file, const uint32 size, FT_Face &face);
+	void closeFont(FT_Face &face);
+private:
+	FT_Library _library;
+	bool _initialized;
+};
+
+#define g_ttf ::Graphics::TTFLibrary::instance()
+
+TTFLibrary::TTFLibrary() : _library(), _initialized(false) {
+	if (!FT_Init_FreeType(&_library))
+		_initialized = true;
+}
+
+TTFLibrary::~TTFLibrary() {
+	if (_initialized) {
+		FT_Done_FreeType(_library);
+		_initialized = false;
+	}
+}
+
+bool TTFLibrary::loadFont(const uint8 *file, const uint32 size, FT_Face &face) {
+	assert(_initialized);
+
+	return (FT_New_Memory_Face(_library, file, size, 0, &face) == 0);
+}
+
+void TTFLibrary::closeFont(FT_Face &face) {
+	assert(_initialized);
+
+	FT_Done_Face(face);
+}
+
+class TTFFont : public Font {
+public:
+	TTFFont();
+	virtual ~TTFFont();
+
+	bool load(Common::SeekableReadStream &stream, int size, bool monochrome);
+
+	virtual int getFontHeight() const;
+
+	virtual int getMaxCharWidth() const;
+
+	virtual int getCharWidth(byte chr) const;
+
+	virtual void drawChar(Surface *dst, byte chr, int x, int y, uint32 color) const;
+private:
+	bool _initialized;
+	FT_Face _face;
+
+	uint8 *_ttfFile;
+	uint32 _size;
+
+	int _width, _height;
+	int _ascent, _descent;
+
+	struct Glyph {
+		Surface image;
+		int xOffset, yOffset;
+		int advance;
+	};
+
+	bool cacheGlyph(Glyph &glyph, byte chr);
+	typedef Common::HashMap<byte, Glyph> GlyphCache;
+	GlyphCache _glyphs;
+
+	bool _monochrome;
+};
+
+TTFFont::TTFFont()
+    : _initialized(false), _face(), _ttfFile(0), _size(0), _width(0), _height(0), _ascent(0),
+      _descent(0), _glyphs(), _monochrome(false) {
+}
+
+TTFFont::~TTFFont() {
+	if (_initialized) {
+		g_ttf.closeFont(_face);
+
+		delete[] _ttfFile;
+		_ttfFile = 0;
+
+		for (GlyphCache::iterator i = _glyphs.begin(), end = _glyphs.end(); i != end; ++i)
+			i->_value.image.free();
+
+		_initialized = false;
+	}
+}
+
+bool TTFFont::load(Common::SeekableReadStream &stream, int size, bool monochrome) {
+	if (!g_ttf.isInitialized())
+		return false;
+
+	_size = stream.size();
+	if (!_size)
+		return false;
+
+	_ttfFile = new uint8[_size];
+	assert(_ttfFile);
+
+	if (stream.read(_ttfFile, _size) != _size) {
+		delete[] _ttfFile;
+		_ttfFile = 0;
+
+		return false;
+	}
+
+	if (!g_ttf.loadFont(_ttfFile, _size, _face)) {
+		delete[] _ttfFile;
+		_ttfFile = 0;
+
+		return false;
+	}
+
+	// We only support scalable fonts.
+	if (!FT_IS_SCALABLE(_face)) {
+		delete[] _ttfFile;
+		_ttfFile = 0;
+
+		g_ttf.closeFont(_face);
+
+		return false;
+	}
+
+	if (FT_Set_Char_Size(_face, 0, size * 64, 0, 0)) {
+		delete[] _ttfFile;
+		_ttfFile = 0;
+
+		return false;
+	}
+
+	_monochrome = monochrome;
+
+	FT_Fixed yScale = _face->size->metrics.y_scale;
+	_ascent = ftCeil26_6(FT_MulFix(_face->ascender, yScale));
+	_descent = ftCeil26_6(FT_MulFix(_face->descender, yScale));
+
+	_width = ftCeil26_6(FT_MulFix(_face->max_advance_width, _face->size->metrics.x_scale));
+	_height = _ascent - _descent + 1;
+
+	// Load all ISO-8859-1 characters.
+	for (uint i = 0; i < 256; ++i)
+		cacheGlyph(_glyphs[i], i);
+
+	_initialized = (_glyphs.size() != 0);
+	return _initialized;
+}
+
+int TTFFont::getFontHeight() const {
+	return _height;
+}
+
+int TTFFont::getMaxCharWidth() const {
+	return _width;
+}
+
+int TTFFont::getCharWidth(byte chr) const {
+	GlyphCache::const_iterator glyphEntry = _glyphs.find(chr);
+	if (glyphEntry == _glyphs.end())
+		return 0;
+	else
+		return glyphEntry->_value.advance;
+}
+
+namespace {
+
+template<typename ColorType>
+void renderGlyph(uint8 *dstPos, const int dstPitch, const uint8 *srcPos, const int srcPitch, const int w, const int h, ColorType color, const PixelFormat &dstFormat) {
+	uint8 sR, sG, sB;
+	dstFormat.colorToRGB(color, sR, sG, sB);
+
+	for (int y = 0; y < h; ++y) {
+		ColorType *rDst = (ColorType *)dstPos;
+		const uint8 *src = srcPos;
+
+		for (int x = 0; x < w; ++x) {
+			if (*src == 255) {
+				*rDst = color;
+			} else if (*src) {
+				const uint8 a = *src;
+
+				uint8 dR, dG, dB;
+				dstFormat.colorToRGB(*rDst, dR, dG, dB);
+
+				dR = ((255 - a) * dR + a * sR) / 255;
+				dG = ((255 - a) * dG + a * sG) / 255;
+				dB = ((255 - a) * dB + a * sB) / 255;
+
+				*rDst = dstFormat.RGBToColor(dR, dG, dB);
+			}
+
+			++rDst;
+			++src;
+		}
+
+		dstPos += dstPitch;
+		srcPos += srcPitch;
+	}
+}
+
+} // End of anonymous namespace
+
+void TTFFont::drawChar(Surface *dst, byte chr, int x, int y, uint32 color) const {
+	GlyphCache::const_iterator glyphEntry = _glyphs.find(chr);
+	if (glyphEntry == _glyphs.end())
+		return;
+
+	const Glyph &glyph = glyphEntry->_value;
+
+	x += glyph.xOffset;
+	y += glyph.yOffset;
+
+	if (x > dst->w)
+		return;
+	if (y > dst->h)
+		return;
+
+	int w = glyph.image.w;
+	int h = glyph.image.h;
+
+	const uint8 *srcPos = (const uint8 *)glyph.image.getBasePtr(0, 0);
+	uint8 *dstPos = (uint8 *)dst->getBasePtr(x, y);
+
+	// Make sure we are not drawing outside the screen bounds
+	if (x < 0) {
+		srcPos -= x;
+		w += x;
+		x = 0;
+	}
+
+	if (x + w > dst->w)
+		w = dst->w - x;
+
+	if (w <= 0)
+		return;
+
+	if (y < 0) {
+		srcPos += y * glyph.image.pitch;
+		h += y;
+		y = 0;
+	}
+
+	if (y + h > dst->h)
+		h = dst->h - y;
+
+	if (h <= 0)
+		return;
+
+	if (dst->format.bytesPerPixel == 1) {
+		for (int cy = 0; cy < h; ++cy) {
+			uint8 *rDst = dstPos;
+			const uint8 *src = srcPos;
+
+			for (int cx = 0; cx < w; ++cx) {
+				// We assume a 1Bpp mode is a color indexed mode, thus we can
+				// not take advantage of anti-aliasing here.
+				if (*src >= 0x80)
+					*rDst = color;
+
+				++rDst;
+				++src;
+			}
+
+			dstPos += dst->pitch;
+			srcPos += glyph.image.pitch;
+		}
+	} else if (dst->format.bytesPerPixel == 2) {
+		renderGlyph<uint16>(dstPos, dst->pitch, srcPos, glyph.image.pitch, w, h, color, dst->format);
+	} else if (dst->format.bytesPerPixel == 4) {
+		renderGlyph<uint32>(dstPos, dst->pitch, srcPos, glyph.image.pitch, w, h, color, dst->format);
+	}
+}
+
+bool TTFFont::cacheGlyph(Glyph &glyph, byte chr) {
+	FT_UInt slot = FT_Get_Char_Index(_face, chr);
+	if (!slot)
+		return false;
+
+	// We use the light target and render mode to improve the looks of the
+	// glyphs. It is most noticable in FreeSansBold.ttf, where otherwise the
+	// 't' glyph looks like it is cut off on the right side.
+	if (FT_Load_Glyph(_face, slot, (_monochrome ? FT_LOAD_MONOCHROME : FT_LOAD_TARGET_LIGHT)))
+		return false;
+
+	if (FT_Render_Glyph(_face->glyph, (_monochrome ? FT_RENDER_MODE_MONO : FT_RENDER_MODE_LIGHT)))
+		return false;
+
+	if (_face->glyph->format != FT_GLYPH_FORMAT_BITMAP)
+		return false;
+
+	FT_Glyph_Metrics &metrics = _face->glyph->metrics;
+
+	glyph.xOffset = ftFloor26_6(metrics.horiBearingX);
+	int xMax = glyph.xOffset + ftCeil26_6(metrics.width);
+	glyph.yOffset = _ascent - ftFloor26_6(metrics.horiBearingY);
+
+	glyph.advance = ftCeil26_6(metrics.horiAdvance);
+
+	// In case we got a negative xMin we adjust that, this might make some
+	// characters make a bit odd, but it's the only way we can assure no
+	// invalid memory writes with the current font API
+	if (glyph.xOffset < 0) {
+		xMax -= glyph.xOffset;
+		glyph.xOffset = 0;
+
+		if (xMax > glyph.advance)
+			glyph.advance = xMax;
+	}
+
+	const FT_Bitmap &bitmap = _face->glyph->bitmap;
+	glyph.image.create(bitmap.width, bitmap.rows, PixelFormat::createFormatCLUT8());
+
+	const uint8 *src = bitmap.buffer;
+	int srcPitch = bitmap.pitch;
+	if (srcPitch < 0) {
+		src += (bitmap.rows - 1) * srcPitch;
+		srcPitch = -srcPitch;
+	}
+
+	uint8 *dst = (uint8 *)glyph.image.getBasePtr(0, 0);
+	memset(dst, 0, glyph.image.h * glyph.image.pitch);
+
+	switch (bitmap.pixel_mode) {
+	case FT_PIXEL_MODE_MONO:
+		for (int y = 0; y < bitmap.rows; ++y) {
+			const uint8 *curSrc = src;
+			uint8 mask = 0;
+
+			for (int x = 0; x < bitmap.width; ++x) {
+				if ((x % 8) == 0)
+					mask = *curSrc++;
+
+				if (mask & 0x80)
+					*dst = 255;
+
+				mask <<= 1;
+				++dst;
+			}
+
+			src += srcPitch;
+		}
+		break;
+
+	case FT_PIXEL_MODE_GRAY:
+		for (int y = 0; y < bitmap.rows; ++y) {
+			memcpy(dst, src, bitmap.width);
+			dst += glyph.image.pitch;
+			src += srcPitch;
+		}
+		break;
+
+	default:
+		warning("TTFFont::cacheGlyph: Unsupported pixel mode %d", bitmap.pixel_mode);
+		return false;
+	}
+
+	return true;
+}
+
+Font *loadTTFFont(Common::SeekableReadStream &stream, int size, bool monochrome) {
+	TTFFont *font = new TTFFont();
+
+	if (!font->load(stream, size, monochrome)) {
+		delete font;
+		return 0;
+	}
+
+	return font;
+}
+
+} // End of namespace Graphics
+
+namespace Common {
+DECLARE_SINGLETON(Graphics::TTFLibrary);
+} // End of namespace Common
+
+#endif
+
diff --git a/graphics/fonts/ttf.h b/graphics/fonts/ttf.h
new file mode 100644
index 0000000..f534988
--- /dev/null
+++ b/graphics/fonts/ttf.h
@@ -0,0 +1,42 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef GRAPHICS_FONTS_TTF_H
+#define GRAPHICS_FONTS_TTF_H
+
+#include "common/scummsys.h"
+
+#ifdef USE_FREETYPE2
+
+#include "common/stream.h"
+
+namespace Graphics {
+
+class Font;
+Font *loadTTFFont(Common::SeekableReadStream &stream, int size, bool monochrome = false);
+
+} // End of namespace Graphics
+
+#endif
+
+#endif
+
diff --git a/graphics/module.mk b/graphics/module.mk
index 02c88d9..1e84b24 100644
--- a/graphics/module.mk
+++ b/graphics/module.mk
@@ -9,6 +9,7 @@ MODULE_OBJS := \
 	fonts/consolefont.o \
 	fonts/newfont_big.o \
 	fonts/newfont.o \
+	fonts/ttf.o \
 	fonts/winfont.o \
 	iff.o \
 	imagedec.o \


Commit: d21ae1aa40f7ef5442d98c377800a0157af069c8
    https://github.com/scummvm/scummvm/commit/d21ae1aa40f7ef5442d98c377800a0157af069c8
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-01-29T07:26:20-08:00

Commit Message:
GUI: Add support for loading TTF files with ISO-8859-1 charset.

Changed paths:
    gui/ThemeEngine.cpp
    gui/ThemeEngine.h
    gui/ThemeParser.cpp
    gui/ThemeParser.h
    gui/themes/default.inc
    gui/themes/scummclassic.zip
    gui/themes/scummclassic/THEMERC
    gui/themes/scummmodern.zip
    gui/themes/scummmodern/THEMERC
    gui/themes/scummtheme.py



diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 461e9cf..585789b 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -34,6 +34,7 @@
 #include "graphics/surface.h"
 #include "graphics/VectorRenderer.h"
 #include "graphics/fonts/bdf.h"
+#include "graphics/fonts/ttf.h"
 
 #include "gui/widget.h"
 #include "gui/ThemeEngine.h"
@@ -557,7 +558,7 @@ bool ThemeEngine::addTextData(const Common::String &drawDataId, TextData textId,
 	return true;
 }
 
-bool ThemeEngine::addFont(TextData textId, const Common::String &file) {
+bool ThemeEngine::addFont(TextData textId, const Common::String &file, const Common::String &scalableFile, const int pointsize) {
 	if (textId == -1)
 		return false;
 
@@ -570,15 +571,21 @@ bool ThemeEngine::addFont(TextData textId, const Common::String &file) {
 		_texts[textId]->_fontPtr = _font;
 	} else {
 		Common::String localized = FontMan.genLocalizedFontFilename(file);
+		const Common::String charset(
+#ifdef USE_TRANSLATION
+		                             TransMan.getCurrentCharset()
+#endif
+		                            );
+
 		// Try localized fonts
-		_texts[textId]->_fontPtr = loadFont(localized, textId == kTextDataDefault);
+		_texts[textId]->_fontPtr = loadFont(localized, scalableFile, charset, pointsize, textId == kTextDataDefault);
 
 		if (!_texts[textId]->_fontPtr) {
 			// Try standard fonts
-			_texts[textId]->_fontPtr = loadFont(file, textId == kTextDataDefault);
+			_texts[textId]->_fontPtr = loadFont(file, scalableFile, Common::String(), pointsize, textId == kTextDataDefault);
 
 			if (!_texts[textId]->_fontPtr)
-				error("Couldn't load font '%s'", file.c_str());
+				error("Couldn't load font '%s'/'%s'", file.c_str(), scalableFile.c_str());
 
 #ifdef USE_TRANSLATION
 			TransMan.setLanguage("C");
@@ -1386,15 +1393,48 @@ DrawData ThemeEngine::parseDrawDataId(const Common::String &name) const {
  * External data loading
  *********************************************************/
 
-const Graphics::Font *ThemeEngine::loadFont(const Common::String &filename, const bool makeLocalizedFont) {
+const Graphics::Font *ThemeEngine::loadScalableFont(const Common::String &filename, const Common::String &charset, const int pointsize, Common::String &name) {
+#ifdef USE_FREETYPE2
+	// We only support ISO-8859-1 for TTF right now.
+	if (!charset.empty()
+	    && !charset.equalsIgnoreCase("iso-8859-1")
+	    && !charset.equalsIgnoreCase("ascii"))
+		return 0;
+
+	name = Common::String::format("%s-%s@%d", filename.c_str(), charset.c_str(), pointsize);
+
 	// Try already loaded fonts.
-	const Graphics::Font *font = FontMan.getFontByName(filename);
+	const Graphics::Font *font = FontMan.getFontByName(name);
 	if (font)
 		return font;
 
-	Common::String cacheFilename = genCacheFilename(filename);
+	Common::ArchiveMemberList members;
+	_themeFiles.listMatchingMembers(members, filename);
+
+	for (Common::ArchiveMemberList::const_iterator i = members.begin(), end = members.end(); i != end; ++i) {
+		Common::SeekableReadStream *stream = (*i)->createReadStream();
+		if (stream) {
+			font = Graphics::loadTTFFont(*stream, pointsize, false);
+			delete stream;
+
+			if (font)
+				return font;
+		}
+	}
+#endif
+	return 0;
+}
+
+const Graphics::Font *ThemeEngine::loadFont(const Common::String &filename, Common::String &name) {
+	name = filename;
+
+	// Try already loaded fonts.
+	const Graphics::Font *font = FontMan.getFontByName(name);
+	if (font)
+		return font;
 
 	Common::ArchiveMemberList members;
+	const Common::String cacheFilename(genCacheFilename(filename));
 	_themeFiles.listMatchingMembers(members, cacheFilename);
 	_themeFiles.listMatchingMembers(members, filename);
 
@@ -1411,20 +1451,34 @@ const Graphics::Font *ThemeEngine::loadFont(const Common::String &filename, cons
 				}
 			}
 			delete stream;
-		}
 
-		if (font)
-			break;
+			if (font)
+				return font;
+		}
 	}
 
+	return 0;
+}
+
+const Graphics::Font *ThemeEngine::loadFont(const Common::String &filename, const Common::String &scalableFilename, const Common::String &charset, const int pointsize, const bool makeLocalizedFont) {
+	Common::String fontName;
+
+	const Graphics::Font *font = 0;
+
+	// Prefer scalable fonts over non-scalable fonts
+	font = loadScalableFont(scalableFilename, charset, pointsize, fontName);
+	if (!font)
+		font = loadFont(filename, fontName);
+
 	// If the font is successfully loaded store it in the font manager.
 	if (font) {
-		FontMan.assignFontToName(filename, font);
+		FontMan.assignFontToName(fontName, font);
 		// If this font should be the new default localized font, we set it up
 		// for that.
 		if (makeLocalizedFont)
-			FontMan.setLocalizedFont(filename);
+			FontMan.setLocalizedFont(fontName);
 	}
+
 	return font;
 }
 
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index 2377098..c49952b 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -35,7 +35,7 @@
 #include "graphics/pixelformat.h"
 
 
-#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.7"
+#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.8"
 
 class OSystem;
 
@@ -411,10 +411,12 @@ public:
 	 * Interface for the ThemeParser class: Loads a font to use on the GUI from the given
 	 * filename.
 	 *
-	 * @param fontName Identifier name for the font.
-	 * @param file Name of the font file.
+	 * @param fextId            Identifier name for the font.
+	 * @param file              Filename of the non-scalable font version.
+	 * @param scalableFile      Filename of the scalable version. (Optional)
+	 * @param pointsize         Point size for the scalable font. (Optional)
 	 */
-	bool addFont(TextData textId, const Common::String &file);
+	bool addFont(TextData textId, const Common::String &file, const Common::String &scalableFile, const int pointsize);
 
 	/**
 	 * Interface for the ThemeParser class: adds a text color value.
@@ -536,8 +538,10 @@ protected:
 	 */
 	void unloadTheme();
 
-	const Graphics::Font *loadFont(const Common::String &filename, const bool makeLocalizedFont);
+	const Graphics::Font *loadScalableFont(const Common::String &filename, const Common::String &charset, const int pointsize, Common::String &name);
+	const Graphics::Font *loadFont(const Common::String &filename, Common::String &name);
 	Common::String genCacheFilename(const Common::String &filename) const;
+	const Graphics::Font *loadFont(const Common::String &filename, const Common::String &scalableFilename, const Common::String &charset, const int pointsize, const bool makeLocalizedFont);
 
 	/**
 	 * Actual Dirty Screen handling function.
diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp
index ea50dcc..9ccdedd 100644
--- a/gui/ThemeParser.cpp
+++ b/gui/ThemeParser.cpp
@@ -176,8 +176,15 @@ bool ThemeParser::parserCallback_font(ParserNode *node) {
 		return true;
 	}
 
+	// Default to a point size of 12.
+	int pointsize = 12;
+	if (node->values.contains("point_size")) {
+		if (sscanf(node->values["point_size"].c_str(), "%d", &pointsize) != 1 || pointsize <= 0)
+			return parserError(Common::String::format("Font \"%s\" has invalid point size \"%s\"", node->values["id"].c_str(), node->values["point_size"].c_str()));
+	}
+
 	TextData textDataId = parseTextDataId(node->values["id"]);
-	if (!_theme->addFont(textDataId, node->values["file"]))
+	if (!_theme->addFont(textDataId, node->values["file"], node->values["scalable_file"], pointsize))
 		return parserError("Error loading Font in theme engine.");
 
 	return true;
diff --git a/gui/ThemeParser.h b/gui/ThemeParser.h
index 1999850..4b7e88c 100644
--- a/gui/ThemeParser.h
+++ b/gui/ThemeParser.h
@@ -65,6 +65,8 @@ protected:
 					XML_PROP(id, true)
 					XML_PROP(file, true)
 					XML_PROP(resolution, false)
+					XML_PROP(scalable_file, false)
+					XML_PROP(point_size, false)
 				KEY_END()
 
 				XML_KEY(text_color)
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 3204620..bd28c2e 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1,460 +1,748 @@
  "<?xml version = '1.0'?>"
-"<layout_info resolution='y>399'> "
-"<globals> "
-"<def var='Line.Height' value='16' /> "
-"<def var='Font.Height' value='16' /> "
-"<def var='About.OuterBorder' value='80'/> "
-"<def var='Layout.Spacing' value='8' /> "
-"<def var='ShowLauncherLogo' value='0'/> "
-"<def var='ShowGlobalMenuLogo' value='0'/> "
-"<def var='ShowSearchPic' value='0'/> "
-"<def var='SaveLoadChooser.ExtInfo.Visible' value='1'/> "
-"<def var='KeyMapper.Spacing' value='10'/> "
-"<def var='KeyMapper.LabelWidth' value='100'/> "
-"<def var='KeyMapper.ButtonWidth' value='80'/> "
-"<def var='Tooltip.MaxWidth' value='200'/> "
-"<def var='Tooltip.XDelta' value='16'/> "
-"<def var='Tooltip.YDelta' value='16'/> "
-"<widget name='OptionsLabel' "
-"size='110,Globals.Line.Height' "
-"textalign='right' "
+"<render_info> "
+"<palette> "
+"<color name='black' "
+"rgb='0,0,0' "
 "/> "
-"<widget name='SmallLabel' "
-"size='24,Globals.Line.Height' "
+"<color name='lightgrey' "
+"rgb='104,104,104' "
 "/> "
-"<widget name='ShortOptionsLabel' "
-"size='60,Globals.Line.Height' "
+"<color name='darkgrey' "
+"rgb='64,64,64' "
 "/> "
-"<widget name='Button' "
-"size='108,24' "
+"<color name='green' "
+"rgb='32,160,32' "
 "/> "
-"<widget name='Slider' "
-"size='128,18' "
+"<color name='green2' "
+"rgb='0,255,0' "
 "/> "
-"<widget name='PopUp' "
-"size='-1,19' "
+"</palette> "
+"<fonts> "
+"<font id='text_default' "
+"file='helvb12.bdf' "
 "/> "
-"<widget name='Checkbox' "
-"size='-1,14' "
+"<font resolution='y<400' "
+"id='text_default' "
+"file='clR6x12.bdf' "
 "/> "
-"<widget name='Radiobutton' "
-"size='-1,Globals.Line.Height' "
+"<font id='text_button' "
+"file='helvb12.bdf' "
 "/> "
-"<widget name='ListWidget' "
-"padding='5,0,8,0' "
+"<font resolution='y<400' "
+"id='text_button' "
+"file='clR6x12.bdf' "
 "/> "
-"<widget name='PopUpWidget' "
-"padding='7,5,0,0' "
+"<font id='text_normal' "
+"file='helvb12.bdf' "
 "/> "
-"<widget name='EditTextWidget' "
-"padding='5,5,0,0' "
+"<font resolution='y<400' "
+"id='text_normal' "
+"file='clR6x12.bdf' "
 "/> "
-"<widget name='Console' "
-"padding='7,5,5,5' "
+"<font id='tooltip_normal' "
+"file='fixed5x8.bdf' "
 "/> "
-"<widget name='Scrollbar' "
-"size='15,0' "
+"<text_color id='color_normal' "
+"color='green' "
 "/> "
-"<widget name='TabWidget.Tab' "
-"size='75,27' "
-"padding='0,0,8,0' "
+"<text_color id='color_normal_inverted' "
+"color='black' "
 "/> "
-"<widget name='TabWidget.Body' "
-"padding='0,0,0,0' "
+"<text_color id='color_normal_hover' "
+"color='green2' "
 "/> "
-"<widget name='TabWidget.NavButton' "
-"size='15,18' "
-"padding='0,3,4,0' "
+"<text_color id='color_normal_disabled' "
+"color='lightgrey' "
 "/> "
-"</globals> "
-"<dialog name='Launcher' overlays='screen'> "
-"<layout type='vertical' center='true' padding='16,16,8,8'> "
-"<widget name='Version' "
-"height='Globals.Line.Height' "
+"<text_color id='color_alternative' "
+"color='lightgrey' "
 "/> "
-"<layout type='horizontal' spacing='5' padding='10,0,0,0'> "
-"<widget name='SearchDesc' "
-"width='60' "
-"height='Globals.Line.Height' "
-"textalign='right' "
+"<text_color id='color_alternative_inverted' "
+"color='255,255,255' "
 "/> "
-"<widget name='Search' "
-"width='150' "
-"height='Globals.Line.Height' "
+"<text_color id='color_alternative_hover' "
+"color='176,176,176' "
 "/> "
-"<widget name='SearchClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<text_color id='color_alternative_disabled' "
+"color='darkgrey' "
 "/> "
-"<space /> "
-"</layout> "
-"<widget name='GameList'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='LoadGameButton' "
-"height='20' "
+"<text_color id='color_button' "
+"color='green' "
 "/> "
-"<widget name='AddGameButton' "
-"height='20' "
+"<text_color id='color_button_hover' "
+"color='green2' "
 "/> "
-"<widget name='EditGameButton' "
-"height='20' "
+"<text_color id='color_button_disabled' "
+"color='lightgrey' "
 "/> "
-"<widget name='RemoveGameButton' "
-"height='20' "
+"</fonts> "
+"<defaults fill='foreground' fg_color='darkgrey' bg_color='black' shadow='0' bevel_color='lightgrey'/> "
+"<drawdata id='text_selection' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='lightgrey' "
 "/> "
-"</layout> "
-"<space size='4'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='QuitButton' "
-"height='20' "
+"</drawdata> "
+"<drawdata id='text_selection_focus' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green' "
 "/> "
-"<widget name='AboutButton' "
-"height='20' "
+"</drawdata> "
+"<drawdata id='mainmenu_bg' cache='false'> "
+"<drawstep func='fill' "
+"fill='foreground' "
+"fg_color='black' "
 "/> "
-"<widget name='OptionsButton' "
-"height='20' "
+"</drawdata> "
+"<drawdata id='special_bg' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/> "
-"<widget name='StartButton' "
-"height='20' "
+"</drawdata> "
+"<drawdata id='tooltip_bg' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='foreground' "
+"fg_color='black' "
 "/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='Browser' overlays='Dialog.Launcher.GameList' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8'> "
-"<widget name='Headline' "
-"height='Globals.Line.Height' "
+"</drawdata> "
+"<drawdata id='separator' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"height='2' "
+"ypos='center' "
+"fg_color='lightgrey' "
 "/> "
-"<widget name='Path' "
-"height='Globals.Line.Height' "
+"</drawdata> "
+"<drawdata id='scrollbar_base' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/> "
-"<widget name='List'/> "
-"<layout type='horizontal' padding='0,0,16,0'> "
-"<widget name='Up' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='scrollbar_handle_hover' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green2' "
 "/> "
-"<space/> "
-"<widget name='Cancel' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='scrollbar_handle_idle' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green' "
 "/> "
-"<widget name='Choose' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='scrollbar_button_idle' cache='false' resolution='y>399'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions' overlays='Dialog.Launcher.GameList' shading='dim'> "
-"<layout type='vertical' padding='0,0,0,0'> "
-"<widget name='TabWidget'/> "
-"<layout type='horizontal' padding='16,16,16,16'> "
-"<space/> "
-"<widget name='Cancel' "
-"type='Button' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='10' "
+"height='10' "
+"xpos='right' "
+"ypos='center' "
+"padding='0,0,3,0' "
+"orientation='top' "
 "/> "
-"<widget name='Ok' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='scrollbar_button_idle' cache='false' resolution='y<400'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='grModePopupDesc' "
-"type='OptionsLabel' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='5' "
+"height='5' "
+"xpos='right' "
+"ypos='center' "
+"padding='0,0,2,0' "
+"orientation='top' "
 "/> "
-"<widget name='grModePopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='grRenderPopupDesc' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='scrollbar_button_hover' cache='false' resolution='y>399'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='grRenderPopup' "
-"type='PopUp' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='10' "
+"height='10' "
+"xpos='right' "
+"ypos='center' "
+"padding='0,0,3,0' "
+"orientation='top' "
 "/> "
-"</layout> "
-"<widget name='grAspectCheckbox' "
-"type='Checkbox' "
+"</drawdata> "
+"<drawdata id='scrollbar_button_hover' cache='false' resolution='y<400'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='grFullscreenCheckbox' "
-"type='Checkbox' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='5' "
+"height='5' "
+"xpos='right' "
+"ypos='center' "
+"padding='0,0,2,0' "
+"orientation='top' "
 "/> "
-"<widget name='grDisableDitheringCheckbox' "
-"type='Checkbox' "
+"</drawdata> "
+"<drawdata id='tab_active' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal_hover' "
+"vertical_align='center' "
+"horizontal_align='center' "
 "/> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='auMidiPopupDesc' "
-"type='OptionsLabel' "
+"<drawstep func='tab' "
+"bevel='2' "
+"radius='0' "
+"fill='none' "
 "/> "
-"<widget name='auMidiPopup' "
-"type='PopUp' "
+"</drawdata> "
+"<drawdata id='tab_inactive' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='center' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='auOPLPopupDesc' "
-"type='OptionsLabel' "
+"<drawstep func='tab' "
+"bevel='2' "
+"radius='0' "
+"fill='none' "
 "/> "
-"<widget name='auOPLPopup' "
-"type='PopUp' "
+"</drawdata> "
+"<drawdata id='tab_background' cache='false'> "
+"</drawdata> "
+"<drawdata id='widget_slider' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='auSampleRatePopupDesc' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='slider_disabled' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='lightgrey' "
 "/> "
-"<widget name='auSampleRatePopup' "
-"type='PopUp' "
+"</drawdata> "
+"<drawdata id='slider_full' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='subToggleDesc' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='slider_hover' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green2' "
 "/> "
-"<widget name='subToggleSpeechOnly' "
-"type='Radiobutton' "
+"</drawdata> "
+"<drawdata id='widget_small' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='subToggleSubOnly' "
-"type='Radiobutton' "
+"</drawdata> "
+"<drawdata id='popup_idle' cache='false' resolution='y>399'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='subToggleSubBoth' "
-"type='Radiobutton' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='10' "
+"height='5' "
+"xpos='right' "
+"ypos='10' "
+"padding='0,0,7,0' "
+"orientation='bottom' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='subSubtitleSpeedDesc' "
-"type='OptionsLabel' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='10' "
+"height='5' "
+"xpos='right' "
+"ypos='4' "
+"padding='0,0,7,0' "
+"orientation='top' "
 "/> "
-"<widget name='subSubtitleSpeedSlider' "
-"type='Slider' "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"<widget name='subSubtitleSpeedLabel' "
-"type='SmallLabel' "
+"</drawdata> "
+"<drawdata id='popup_idle' cache='false' resolution='y<400'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='horizontal' padding='16,16,16,16' spacing='8'> "
-"<layout type='vertical' padding='0,0,0,0' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<widget name='vcMusicText' "
-"type='OptionsLabel' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='7' "
+"height='4' "
+"xpos='right' "
+"ypos='9' "
+"padding='0,0,3,0' "
+"orientation='bottom' "
 "/> "
-"<widget name='vcMusicSlider' "
-"type='Slider' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='7' "
+"height='4' "
+"xpos='right' "
+"ypos='4' "
+"padding='0,0,3,0' "
+"orientation='top' "
 "/> "
-"<widget name='vcMusicLabel' "
-"type='SmallLabel' "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<widget name='vcSfxText' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='popup_disabled' cache='false' resolution='y>399'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='vcSfxSlider' "
-"type='Slider' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='10' "
+"height='5' "
+"xpos='right' "
+"ypos='10' "
+"padding='0,0,7,0' "
+"orientation='bottom' "
 "/> "
-"<widget name='vcSfxLabel' "
-"type='SmallLabel' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='10' "
+"height='5' "
+"xpos='right' "
+"ypos='4' "
+"padding='0,0,7,0' "
+"orientation='top' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<widget name='vcSpeechText' "
-"type='OptionsLabel' "
+"<text font='text_default' "
+"text_color='color_normal_disabled' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"<widget name='vcSpeechSlider' "
-"type='Slider' "
+"</drawdata> "
+"<drawdata id='popup_disabled' cache='false' resolution='y<400'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='vcSpeechLabel' "
-"type='SmallLabel' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='7' "
+"height='4' "
+"xpos='right' "
+"ypos='9' "
+"padding='0,0,3,0' "
+"orientation='bottom' "
 "/> "
-"</layout> "
-"</layout> "
-"<layout type='vertical' padding='24,0,24,0' center='true'> "
-"<widget name='vcMuteCheckbox' "
-"type='Checkbox' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='auPrefGmPopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='auPrefGmPopup' "
-"type='PopUp' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='7' "
+"height='4' "
+"xpos='right' "
+"ypos='4' "
+"padding='0,0,3,0' "
+"orientation='top' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='mcFontButton' "
-"type='Button' "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"<widget name='mcFontPath' "
-"height='Globals.Line.Height' "
+"</drawdata> "
+"<drawdata id='popup_hover' cache='false' resolution='y>399'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='mcFontClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='10' "
+"height='5' "
+"xpos='right' "
+"ypos='10' "
+"padding='0,0,7,0' "
+"orientation='bottom' "
 "/> "
-"</layout> "
-"<widget name='mcMixedCheckbox' "
-"type='Checkbox' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='10' "
+"height='5' "
+"xpos='right' "
+"ypos='4' "
+"padding='0,0,7,0' "
+"orientation='top' "
 "/> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<widget name='mcMidiGainText' "
-"type='OptionsLabel' "
+"<text font='text_default' "
+"text_color='color_normal_hover' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"<widget name='mcMidiGainSlider' "
-"type='Slider' "
+"</drawdata> "
+"<drawdata id='popup_hover' cache='false' resolution='y<400'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='mcMidiGainLabel' "
-"width='32' "
-"height='Globals.Line.Height' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='7' "
+"height='4' "
+"xpos='right' "
+"ypos='9' "
+"padding='0,0,3,0' "
+"orientation='bottom' "
 "/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='auPrefMt32PopupDesc' "
-"type='OptionsLabel' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='7' "
+"height='4' "
+"xpos='right' "
+"ypos='4' "
+"padding='0,0,3,0' "
+"orientation='top' "
 "/> "
-"<widget name='auPrefMt32Popup' "
-"type='PopUp' "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"</layout> "
-"<widget name='mcMt32Checkbox' "
-"type='Checkbox' "
+"</drawdata> "
+"<drawdata id='widget_textedit' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='mcGSCheckbox' "
-"type='Checkbox' "
+"</drawdata> "
+"<drawdata id='plain_bg' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Paths' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='SaveButton' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='caret' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='lightgrey' "
 "/> "
-"<widget name='SavePath' "
-"height='Globals.Line.Height' "
+"</drawdata> "
+"<drawdata id='default_bg' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/> "
-"<widget name='SavePathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"</drawdata> "
+"<drawdata id='button_idle' cache='false'> "
+"<text font='text_button' "
+"text_color='color_button' "
+"vertical_align='center' "
+"horizontal_align='center' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='ThemeButton' "
-"type='Button' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='ThemePath' "
-"height='Globals.Line.Height' "
+"</drawdata> "
+"<drawdata id='button_hover' cache='false'> "
+"<text font='text_button' "
+"text_color='color_button_hover' "
+"vertical_align='center' "
+"horizontal_align='center' "
 "/> "
-"<widget name='ThemePathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='ExtraButton' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='button_disabled' cache='false'> "
+"<text font='text_button' "
+"text_color='color_button_disabled' "
+"vertical_align='center' "
+"horizontal_align='center' "
 "/> "
-"<widget name='ExtraPath' "
-"height='Globals.Line.Height' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='ExtraPathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"</drawdata> "
+"<drawdata id='checkbox_disabled' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal_disabled' "
+"vertical_align='top' "
+"horizontal_align='left' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='PluginsButton' "
-"type='Button' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='PluginsPath' "
-"height='Globals.Line.Height' "
+"</drawdata> "
+"<drawdata id='checkbox_selected' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='top' "
+"horizontal_align='left' "
 "/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='ThemeButton' "
-"type='Button' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='CurTheme' "
-"height='Globals.Line.Height' "
+"<drawstep func='cross' "
+"fill='foreground' "
+"stroke='2' "
+"fg_color='green' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='RendererPopupDesc' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='checkbox_default' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='top' "
+"horizontal_align='left' "
 "/> "
-"<widget name='RendererPopup' "
-"type='PopUp' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='AutosavePeriodPopupDesc' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='radiobutton_default' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"<widget name='AutosavePeriodPopup' "
-"type='PopUp' "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='7' "
+"fill='background' "
+"bg_color='darkgrey' "
+"xpos='0' "
+"ypos='0' "
+"/> "
+"</drawdata> "
+"<drawdata id='radiobutton_selected' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
+"/> "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='7' "
+"fg_color='darkgrey' "
+"fill='none' "
+"xpos='0' "
+"ypos='0' "
+"/> "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='5' "
+"fg_color='green' "
+"fill='foreground' "
+"xpos='2' "
+"ypos='2' "
+"/> "
+"</drawdata> "
+"<drawdata id='radiobutton_disabled' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal_disabled' "
+"vertical_align='center' "
+"horizontal_align='left' "
+"/> "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='7' "
+"bg_color='lightgrey' "
+"fill='background' "
+"xpos='0' "
+"ypos='0' "
+"/> "
+"</drawdata> "
+"<drawdata id='widget_default' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"/> "
+"</drawdata> "
+"<drawdata id='widget_small' cache='false'> "
+"<drawstep func='square' "
+"stroke='0' "
+"/> "
+"</drawdata> "
+"</render_info> "
+"<layout_info resolution='y<400'> "
+"<globals> "
+"<def var='Line.Height' value='12' /> "
+"<def var='Font.Height' value='10' /> "
+"<def var='About.OuterBorder' value='10'/> "
+"<def var='Layout.Spacing' value='8'/> "
+"<def var='ShowLauncherLogo' value='0'/> "
+"<def var='ShowGlobalMenuLogo' value='0'/> "
+"<def var='ShowSearchPic' value='0'/> "
+"<def var='SaveLoadChooser.ExtInfo.Visible' value='0'/> "
+"<def var='KeyMapper.Spacing' value='5'/> "
+"<def var='KeyMapper.LabelWidth' value='80'/> "
+"<def var='KeyMapper.ButtonWidth' value='60'/> "
+"<def var='Tooltip.MaxWidth' value='70'/> "
+"<def var='Tooltip.XDelta' value='8'/> "
+"<def var='Tooltip.YDelta' value='8'/> "
+"<widget name='Button' "
+"size='72,16' "
+"/> "
+"<widget name='Slider' "
+"size='85,12' "
+"/> "
+"<widget name='OptionsLabel' "
+"size='110,Globals.Line.Height' "
+"textalign='right' "
+"/> "
+"<widget name='SmallLabel' "
+"size='18,Globals.Line.Height' "
+"/> "
+"<widget name='PopUp' "
+"size='-1,15' "
+"/> "
+"<widget name='Checkbox' "
+"size='-1,Globals.Line.Height' "
+"/> "
+"<widget name='Radiobutton' "
+"size='-1,Globals.Line.Height' "
+"/> "
+"<widget name='ListWidget' "
+"padding='5,0,0,0' "
+"/> "
+"<widget name='PopUpWidget' "
+"padding='7,5,0,0' "
+"/> "
+"<widget name='EditTextWidget' "
+"padding='5,5,0,0' "
+"/> "
+"<widget name='Console' "
+"padding='7,5,5,5' "
+"/> "
+"<widget name='Scrollbar' "
+"size='9,0' "
+"/> "
+"<widget name='TabWidget.Tab' "
+"size='45,16' "
+"padding='0,0,2,0' "
+"/> "
+"<widget name='TabWidget.Body' "
+"padding='0,0,0,-8' "
+"/> "
+"<widget name='TabWidget.NavButton' "
+"size='32,18' "
+"padding='0,0,1,0' "
+"/> "
+"</globals> "
+"<dialog name='Launcher' overlays='screen'> "
+"<layout type='vertical' center='true' padding='6,6,2,2'> "
+"<widget name='Version' "
+"height='Globals.Line.Height' "
+"/> "
+"<layout type='horizontal' spacing='5' padding='0,0,0,0'> "
+"<widget name='SearchDesc' "
+"width='50' "
+"height='Globals.Line.Height' "
+"textalign='right' "
+"/> "
+"<widget name='Search' "
+"width='150' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='SearchClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
+"<space /> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='GuiLanguagePopupDesc' "
-"type='OptionsLabel' "
+"<widget name='GameList'/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<widget name='LoadGameButton' "
+"height='12' "
 "/> "
-"<widget name='GuiLanguagePopup' "
-"type='PopUp' "
+"<widget name='AddGameButton' "
+"height='12' "
+"/> "
+"<widget name='EditGameButton' "
+"height='12' "
+"/> "
+"<widget name='RemoveGameButton' "
+"height='12' "
 "/> "
 "</layout> "
-"<widget name='KeysButton' "
-"type='Button' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<widget name='QuitButton' "
+"height='12' "
+"/> "
+"<widget name='AboutButton' "
+"height='12' "
+"/> "
+"<widget name='OptionsButton' "
+"height='12' "
+"/> "
+"<widget name='StartButton' "
+"height='12' "
 "/> "
 "</layout> "
+"</layout> "
 "</dialog> "
-"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
-"<widget name='Action' "
+"<dialog name='Browser' overlays='screen' inset='8' shading='dim'> "
+"<layout type='vertical' padding='8,8,0,4'> "
+"<widget name='Headline' "
 "height='Globals.Line.Height' "
 "/> "
-"<widget name='List'/> "
-"<widget name='Mapping' "
+"<widget name='Path' "
 "height='Globals.Line.Height' "
 "/> "
-"<space size='Globals.Line.Height'/> "
-"<layout type='horizontal'> "
-"<widget name='Map' "
+"<widget name='List'/> "
+"<layout type='horizontal' padding='0,0,8,0'> "
+"<widget name='Up' "
 "type='Button' "
 "/> "
 "<space/> "
 "<widget name='Cancel' "
 "type='Button' "
 "/> "
-"<widget name='Ok' "
+"<widget name='Choose' "
 "type='Button' "
 "/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='GameOptions' overlays='Dialog.Launcher.GameList' shading='dim'> "
-"<layout type='vertical' padding='0,0,0,0' spacing='16'> "
+"<dialog name='GlobalOptions' overlays='screen' inset='16' shading='dim'> "
+"<layout type='vertical' padding='0,0,0,0'> "
 "<widget name='TabWidget'/> "
-"<layout type='horizontal' padding='16,16,16,4'> "
+"<layout type='horizontal' padding='8,8,8,8'> "
 "<space/> "
 "<widget name='Cancel' "
 "type='Button' "
@@ -465,170 +753,91 @@
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='GameOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
 "<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<widget name='EnableTabCheckbox' "
-"type='Checkbox' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='grModePopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='grModePopup' "
+"type='PopUp' "
 "/> "
-"<import layout='Dialog.GlobalOptions_Graphics' /> "
 "</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<widget name='EnableTabCheckbox' "
-"type='Checkbox' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='grRenderPopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='grRenderPopup' "
+"type='PopUp' "
 "/> "
-"<import layout='Dialog.GlobalOptions_Audio' /> "
 "</layout> "
-"</dialog> "
-"<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<widget name='EnableTabCheckbox' "
+"<widget name='grAspectCheckbox' "
 "type='Checkbox' "
 "/> "
-"<import layout='Dialog.GlobalOptions_MIDI' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<widget name='EnableTabCheckbox' "
+"<widget name='grFullscreenCheckbox' "
 "type='Checkbox' "
 "/> "
-"<import layout='Dialog.GlobalOptions_MT32' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<widget name='EnableTabCheckbox' "
+"<widget name='grDisableDitheringCheckbox' "
 "type='Checkbox' "
 "/> "
-"<import layout='Dialog.GlobalOptions_Volume' /> "
 "</layout> "
 "</dialog> "
-"<dialog name='GameOptions_Game' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
-"<layout type='vertical' padding='16,16,16,16'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='Id' "
+"<dialog name='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='auMidiPopupDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='Domain' "
+"<widget name='auMidiPopup' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='Name' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='auOPLPopupDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='Desc' "
+"<widget name='auOPLPopup' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='LangPopupDesc' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='auSampleRatePopupDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='LangPopup' "
+"<widget name='auSampleRatePopup' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='PlatformPopupDesc' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='3' center='true'> "
+"<widget name='subToggleDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='PlatformPopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Paths' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
-"<layout type='vertical' padding='16,16,16,16'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='Savepath' "
-"type='Button' "
+"<widget name='subToggleSpeechOnly' "
+"type='Radiobutton' "
 "/> "
-"<widget name='SavepathText' "
-"height='Globals.Line.Height' "
+"<widget name='subToggleSubOnly' "
+"type='Radiobutton' "
 "/> "
-"<widget name='SavePathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<widget name='subToggleSubBoth' "
+"type='Radiobutton' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='Extrapath' "
-"type='Button' "
-"/> "
-"<widget name='ExtrapathText' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='ExtraPathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='subSubtitleSpeedDesc' "
+"type='OptionsLabel' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='Gamepath' "
-"type='Button' "
+"<widget name='subSubtitleSpeedSlider' "
+"type='Slider' "
 "/> "
-"<widget name='GamepathText' "
-"height='Globals.Line.Height' "
+"<widget name='subSubtitleSpeedLabel' "
+"type='SmallLabel' "
 "/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='GlobalMenu' overlays='screen_center'> "
-"<layout type='vertical' padding='16,16,16,16' center='true'> "
-"<widget name='Title' "
-"width='210' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='Version' "
-"width='210' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='Resume' "
-"width='150' "
-"height='Globals.Button.Height' "
-"/> "
-"<space size='10'/> "
-"<widget name='Load' "
-"width='150' "
-"height='Globals.Button.Height' "
-"/> "
-"<widget name='Save' "
-"width='150' "
-"height='Globals.Button.Height' "
-"/> "
-"<space size='10'/> "
-"<widget name='Options' "
-"width='150' "
-"height='Globals.Button.Height' "
-"/> "
-"<widget name='Help' "
-"width='150' "
-"height='Globals.Button.Height' "
-"/> "
-"<widget name='About' "
-"width='150' "
-"height='Globals.Button.Height' "
-"/> "
-"<space size='10'/> "
-"<widget name='RTL' "
-"width='150' "
-"height='Globals.Button.Height' "
-"/> "
-"<widget name='Quit' "
-"width='150' "
-"height='Globals.Button.Height' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalConfig' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8'> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<layout type='vertical' padding='0,0,0,0' center='true'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<dialog name='GlobalOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='vcMusicText' "
 "type='OptionsLabel' "
 "/> "
@@ -639,7 +848,7 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='vcSfxText' "
 "type='OptionsLabel' "
 "/> "
@@ -650,7 +859,7 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='vcSpeechText' "
 "type='OptionsLabel' "
 "/> "
@@ -661,316 +870,190 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"</layout> "
-"<layout type='vertical' padding='24,24,24,24' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<space size='110' /> "
 "<widget name='vcMuteCheckbox' "
 "type='Checkbox' "
-"width='80'  "
 "/> "
 "</layout> "
 "</layout> "
-"<space size='8' /> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='subToggleDesc' "
+"</dialog> "
+"<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='auPrefGmPopupDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='subToggleSpeechOnly' "
-"type='Radiobutton' "
-"width='100' "
+"<widget name='auPrefGmPopup' "
+"type='PopUp' "
 "/> "
-"<widget name='subToggleSubOnly' "
-"type='Radiobutton' "
-"width='100' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"<widget name='mcFontButton' "
+"type='Button' "
 "/> "
-"<widget name='subToggleSubBoth' "
-"type='Radiobutton' "
-"width='100' "
+"<widget name='mcFontPath' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='mcFontClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='subSubtitleSpeedDesc' "
+"<widget name='mcMixedCheckbox' "
+"type='Checkbox' "
+"/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='mcMidiGainText' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='subSubtitleSpeedSlider' "
+"<widget name='mcMidiGainSlider' "
 "type='Slider' "
 "/> "
-"<widget name='subSubtitleSpeedLabel' "
-"type='SmallLabel' "
+"<widget name='mcMidiGainLabel' "
+"width='32' "
+"height='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<space size='60'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='Keys' "
-"type='Button' "
-"/> "
-"<space size='Globals.Button.Width' /> "
-"<widget name='Cancel' "
-"type='Button' "
+"</layout> "
+"</dialog> "
+"<dialog name='GlobalOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='auPrefMt32PopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='Ok' "
-"type='Button' "
+"<widget name='auPrefMt32Popup' "
+"type='PopUp' "
 "/> "
 "</layout> "
+"<widget name='mcMt32Checkbox' "
+"type='Checkbox' "
+"/> "
+"<widget name='mcGSCheckbox' "
+"type='Checkbox' "
+"/> "
 "</layout> "
 "</dialog> "
-"<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,32' center='true'> "
-"<widget name='Title' "
+"<dialog name='GlobalOptions_Paths' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='SaveButton' "
+"type='Button' "
+"/> "
+"<widget name='SavePath' "
 "height='Globals.Line.Height' "
 "/> "
-"<layout type='horizontal' padding='0,0,0,16' spacing='16'> "
-"<widget name='List' /> "
-"<widget name='Thumbnail' "
-"width='180' "
-"height='200' "
+"<widget name='SavePathClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<space/> "
-"<widget name='Delete' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='ThemeButton' "
 "type='Button' "
 "/> "
-"<space size='32'/> "
-"<widget name='Cancel' "
-"type='Button' "
+"<widget name='ThemePath' "
+"height='Globals.Line.Height' "
 "/> "
-"<widget name='Choose' "
-"type='Button' "
+"<widget name='ThemePathClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
 "</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='ScummHelp' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
-"<widget name='Title' "
-"width='320' "
-"height='Globals.Line.Height' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='ExtraButton' "
+"type='Button' "
 "/> "
-"<widget name='HelpText' "
-"height='200' "
+"<widget name='ExtraPath' "
+"height='Globals.Line.Height' "
 "/> "
-"<layout type='horizontal' padding='0,0,16,0'> "
-"<widget name='Prev' "
-"type='Button' "
+"<widget name='ExtraPathClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
-"<widget name='Next' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='PluginsButton' "
 "type='Button' "
 "/> "
-"<space size='32'/> "
-"<widget name='Close' "
-"type='Button' "
+"<widget name='PluginsPath' "
+"height='Globals.Line.Height' "
 "/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='LoomTownsDifficultyDialog' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
-"<widget name='Description1' "
-"width='320' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='Description2' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='Standard' "
-"type='Button' "
-"/> "
-"<widget name='Practice' "
-"type='Button' "
-"/> "
-"<widget name='Expert' "
+"<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='ThemeButton' "
 "type='Button' "
 "/> "
-"</layout> "
-"</dialog> "
-"<dialog name='MassAdd' overlays='screen_center' shading='dim'> "
-"<layout type='vertical' padding='8,8,32,8' center='true'> "
-"<widget name='DirProgressText' "
-"width='480' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='GameProgressText' "
-"width='480' "
+"<widget name='CurTheme' "
 "height='Globals.Line.Height' "
 "/> "
-"<widget name='GameList' "
-"width='480' "
-"height='250' "
-"/> "
-"<layout type='horizontal' padding='8,8,8,8'> "
-"<widget name='Ok' "
-"type='Button' "
-"/> "
-"<widget name='Cancel' "
-"type='Button' "
-"/> "
 "</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='KeyMapper' overlays='screen_center' shading='dim'> "
-"<layout type='vertical' padding='8,8,32,8' spacing='10' center='true'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='PopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='Popup' "
-"type='PopUp' "
-"width='400' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='RendererPopupDesc' "
+"width='80' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<widget name='KeymapArea' "
-"width='600' "
-"height='280' "
-"/> "
-"<widget name='Close' "
-"type='Button' "
-"/> "
-"</layout> "
-"</dialog> "
-"</layout_info> "
-"<layout_info resolution='y<400'> "
-"<globals> "
-"<def var='Line.Height' value='12' /> "
-"<def var='Font.Height' value='10' /> "
-"<def var='About.OuterBorder' value='10'/> "
-"<def var='Layout.Spacing' value='8'/> "
-"<def var='ShowLauncherLogo' value='0'/> "
-"<def var='ShowGlobalMenuLogo' value='0'/> "
-"<def var='ShowSearchPic' value='0'/> "
-"<def var='SaveLoadChooser.ExtInfo.Visible' value='0'/> "
-"<def var='KeyMapper.Spacing' value='5'/> "
-"<def var='KeyMapper.LabelWidth' value='80'/> "
-"<def var='KeyMapper.ButtonWidth' value='60'/> "
-"<def var='Tooltip.MaxWidth' value='70'/> "
-"<def var='Tooltip.XDelta' value='8'/> "
-"<def var='Tooltip.YDelta' value='8'/> "
-"<widget name='Button' "
-"size='72,16' "
-"/> "
-"<widget name='Slider' "
-"size='85,12' "
-"/> "
-"<widget name='OptionsLabel' "
-"size='110,Globals.Line.Height' "
 "textalign='right' "
 "/> "
-"<widget name='SmallLabel' "
-"size='18,Globals.Line.Height' "
-"/> "
-"<widget name='PopUp' "
-"size='-1,15' "
-"/> "
-"<widget name='Checkbox' "
-"size='-1,Globals.Line.Height' "
-"/> "
-"<widget name='Radiobutton' "
-"size='-1,Globals.Line.Height' "
-"/> "
-"<widget name='ListWidget' "
-"padding='5,0,0,0' "
-"/> "
-"<widget name='PopUpWidget' "
-"padding='7,5,0,0' "
-"/> "
-"<widget name='EditTextWidget' "
-"padding='5,5,0,0' "
-"/> "
-"<widget name='Console' "
-"padding='7,5,5,5' "
-"/> "
-"<widget name='Scrollbar' "
-"size='9,0' "
-"/> "
-"<widget name='TabWidget.Tab' "
-"size='45,16' "
-"padding='0,0,2,0' "
-"/> "
-"<widget name='TabWidget.Body' "
-"padding='0,0,0,-8' "
-"/> "
-"<widget name='TabWidget.NavButton' "
-"size='32,18' "
-"padding='0,0,1,0' "
-"/> "
-"</globals> "
-"<dialog name='Launcher' overlays='screen'> "
-"<layout type='vertical' center='true' padding='6,6,2,2'> "
-"<widget name='Version' "
-"height='Globals.Line.Height' "
+"<widget name='RendererPopup' "
+"type='PopUp' "
 "/> "
-"<layout type='horizontal' spacing='5' padding='0,0,0,0'> "
-"<widget name='SearchDesc' "
-"width='50' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='AutosavePeriodPopupDesc' "
+"width='80' "
 "height='Globals.Line.Height' "
 "textalign='right' "
 "/> "
-"<widget name='Search' "
-"width='150' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='SearchClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<widget name='AutosavePeriodPopup' "
+"type='PopUp' "
 "/> "
-"<space /> "
 "</layout> "
-"<widget name='GameList'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
-"<widget name='LoadGameButton' "
-"height='12' "
-"/> "
-"<widget name='AddGameButton' "
-"height='12' "
-"/> "
-"<widget name='EditGameButton' "
-"height='12' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='GuiLanguagePopupDesc' "
+"width='80' "
+"height='Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"<widget name='RemoveGameButton' "
-"height='12' "
+"<widget name='GuiLanguagePopup' "
+"type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
-"<widget name='QuitButton' "
-"height='12' "
-"/> "
-"<widget name='AboutButton' "
-"height='12' "
-"/> "
-"<widget name='OptionsButton' "
-"height='12' "
-"/> "
-"<widget name='StartButton' "
-"height='12' "
+"<widget name='KeysButton' "
+"type='Button' "
 "/> "
 "</layout> "
-"</layout> "
 "</dialog> "
-"<dialog name='Browser' overlays='screen' inset='8' shading='dim'> "
-"<layout type='vertical' padding='8,8,0,4'> "
-"<widget name='Headline' "
+"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"<widget name='Action' "
 "height='Globals.Line.Height' "
 "/> "
-"<widget name='Path' "
+"<widget name='List'/> "
+"<widget name='Mapping' "
 "height='Globals.Line.Height' "
 "/> "
-"<widget name='List'/> "
-"<layout type='horizontal' padding='0,0,8,0'> "
-"<widget name='Up' "
+"<space size='Globals.Line.Height'/> "
+"<layout type='horizontal'> "
+"<widget name='Map' "
 "type='Button' "
 "/> "
 "<space/> "
 "<widget name='Cancel' "
 "type='Button' "
 "/> "
-"<widget name='Choose' "
+"<widget name='Ok' "
 "type='Button' "
 "/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='GlobalOptions' overlays='screen' inset='16' shading='dim'> "
-"<layout type='vertical' padding='0,0,0,0'> "
+"<dialog name='GameOptions' overlays='screen' inset='16' shading='dim'> "
+"<layout type='vertical' padding='0,0,0,0' spacing='16'> "
 "<widget name='TabWidget'/> "
 "<layout type='horizontal' padding='8,8,8,8'> "
 "<space/> "
@@ -983,90 +1066,176 @@
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='grModePopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='grModePopup' "
-"type='PopUp' "
+"<dialog name='GameOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
+"<widget name='EnableTabCheckbox' "
+"type='Checkbox' "
 "/> "
+"<import layout='Dialog.GlobalOptions_Graphics' /> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='grRenderPopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='grRenderPopup' "
-"type='PopUp' "
+"</dialog> "
+"<dialog name='GameOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
+"<widget name='EnableTabCheckbox' "
+"type='Checkbox' "
 "/> "
+"<import layout='Dialog.GlobalOptions_Audio' /> "
 "</layout> "
-"<widget name='grAspectCheckbox' "
+"</dialog> "
+"<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
+"<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
 "/> "
-"<widget name='grFullscreenCheckbox' "
+"<import layout='Dialog.GlobalOptions_MIDI' /> "
+"</layout> "
+"</dialog> "
+"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
+"<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
 "/> "
-"<widget name='grDisableDitheringCheckbox' "
+"<import layout='Dialog.GlobalOptions_MT32' /> "
+"</layout> "
+"</dialog> "
+"<dialog name='GameOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
+"<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
 "/> "
+"<import layout='Dialog.GlobalOptions_Volume' /> "
 "</layout> "
 "</dialog> "
-"<dialog name='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<dialog name='GameOptions_Game' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,8'> "
 "<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='auMidiPopupDesc' "
-"type='OptionsLabel' "
+"<widget name='Id' "
+"width='35' "
+"height='Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"<widget name='auMidiPopup' "
+"<widget name='Domain' "
 "type='PopUp' "
 "/> "
 "</layout> "
 "<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='auOPLPopupDesc' "
-"type='OptionsLabel' "
+"<widget name='Name' "
+"width='35' "
+"height='Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"<widget name='auOPLPopup' "
+"<widget name='Desc' "
 "type='PopUp' "
 "/> "
 "</layout> "
+"<space size='8'/> "
 "<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='auSampleRatePopupDesc' "
-"type='OptionsLabel' "
+"<widget name='LangPopupDesc' "
+"width='60' "
+"height='Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"<widget name='auSampleRatePopup' "
+"<widget name='LangPopup' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='3' center='true'> "
-"<widget name='subToggleDesc' "
-"type='OptionsLabel' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='PlatformPopupDesc' "
+"width='60' "
+"height='Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"<widget name='subToggleSpeechOnly' "
-"type='Radiobutton' "
+"<widget name='PlatformPopup' "
+"type='PopUp' "
 "/> "
-"<widget name='subToggleSubOnly' "
-"type='Radiobutton' "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='GameOptions_Paths' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"<widget name='Savepath' "
+"type='Button' "
 "/> "
-"<widget name='subToggleSubBoth' "
-"type='Radiobutton' "
+"<widget name='SavepathText' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='SavePathClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='subSubtitleSpeedDesc' "
-"type='OptionsLabel' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"<widget name='Extrapath' "
+"type='Button' "
 "/> "
-"<widget name='subSubtitleSpeedSlider' "
-"type='Slider' "
+"<widget name='ExtrapathText' "
+"height='Globals.Line.Height' "
 "/> "
-"<widget name='subSubtitleSpeedLabel' "
-"type='SmallLabel' "
+"<widget name='ExtraPathClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"<widget name='Gamepath' "
+"type='Button' "
+"/> "
+"<widget name='GamepathText' "
+"height='Globals.Line.Height' "
 "/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='GlobalOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<dialog name='GlobalMenu' overlays='screen_center'> "
+"<layout type='vertical' padding='2,2,4,6' center='true' spacing='6'> "
+"<widget name='Title' "
+"width='160' "
+"height='4' "
+"/> "
+"<widget name='Version' "
+"width='160' "
+"height='4' "
+"/> "
+"<space size='1'/> "
+"<widget name='Load' "
+"width='120' "
+"height='12' "
+"/> "
+"<widget name='Save' "
+"width='120' "
+"height='12' "
+"/> "
+"<space size='1'/> "
+"<widget name='Options' "
+"width='120' "
+"height='12' "
+"/> "
+"<widget name='Help' "
+"width='120' "
+"height='12' "
+"/> "
+"<widget name='About' "
+"width='120' "
+"height='12' "
+"/> "
+"<space size='1'/> "
+"<widget name='Resume' "
+"width='120' "
+"height='12' "
+"/> "
+"<widget name='RTL' "
+"width='120' "
+"height='12' "
+"/> "
+"<widget name='Quit' "
+"width='120' "
+"height='12' "
+"/> "
+"</layout> "
+"</dialog> "
+"<dialog name='GlobalConfig' overlays='screen_center'> "
+"<layout type='vertical' padding='8,8,8,8'> "
 "<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='vcMusicText' "
 "type='OptionsLabel' "
@@ -1104,188 +1273,311 @@
 "<space size='110' /> "
 "<widget name='vcMuteCheckbox' "
 "type='Checkbox' "
+"width='80' "
 "/> "
 "</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='auPrefGmPopupDesc' "
+"<layout type='vertical' padding='0,0,0,0' spacing='1' center='true'> "
+"<widget name='subToggleDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='auPrefGmPopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
-"<widget name='mcFontButton' "
-"type='Button' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='subToggleSpeechOnly' "
+"type='Radiobutton' "
+"width='90' "
 "/> "
-"<widget name='mcFontPath' "
-"height='Globals.Line.Height' "
+"<widget name='subToggleSubOnly' "
+"type='Radiobutton' "
+"width='90' "
 "/> "
-"<widget name='mcFontClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<widget name='subToggleSubBoth' "
+"type='Radiobutton' "
+"width='90' "
 "/> "
 "</layout> "
-"<widget name='mcMixedCheckbox' "
-"type='Checkbox' "
-"/> "
+"</layout> "
+"<space size='2' /> "
 "<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='mcMidiGainText' "
+"<widget name='subSubtitleSpeedDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='mcMidiGainSlider' "
+"<widget name='subSubtitleSpeedSlider' "
 "type='Slider' "
 "/> "
-"<widget name='mcMidiGainLabel' "
-"width='32' "
-"height='Globals.Line.Height' "
+"<widget name='subSubtitleSpeedLabel' "
+"type='SmallLabel' "
 "/> "
 "</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='auPrefMt32PopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='auPrefMt32Popup' "
-"type='PopUp' "
+"<space size='16'/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='4'> "
+"<widget name='Keys' "
+"type='Button' "
 "/> "
-"</layout> "
-"<widget name='mcMt32Checkbox' "
-"type='Checkbox' "
+"<space size='Globals.Button.Width' /> "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
-"<widget name='mcGSCheckbox' "
-"type='Checkbox' "
+"<widget name='Ok' "
+"type='Button' "
 "/> "
 "</layout> "
+"</layout> "
 "</dialog> "
-"<dialog name='GlobalOptions_Paths' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='SaveButton' "
+"<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"<widget name='Title' height='Globals.Line.Height'/> "
+"<widget name='List' /> "
+"<layout type='horizontal' padding='0,0,16,0'> "
+"<space/> "
+"<widget name='Delete' "
 "type='Button' "
 "/> "
-"<widget name='SavePath' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='SavePathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<space size='16'/> "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='ThemeButton' "
+"<widget name='Choose' "
 "type='Button' "
 "/> "
-"<widget name='ThemePath' "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='ScummHelp' overlays='screen'> "
+"<layout type='vertical' padding='8,8,8,8'> "
+"<widget name='Title' "
+"width='180' "
 "height='Globals.Line.Height' "
 "/> "
-"<widget name='ThemePathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<widget name='HelpText' "
+"height='140' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='ExtraButton' "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<widget name='Prev' "
 "type='Button' "
 "/> "
-"<widget name='ExtraPath' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='ExtraPathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<widget name='Next' "
+"type='Button' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='PluginsButton' "
+"<space size='32'/> "
+"<widget name='Close' "
 "type='Button' "
 "/> "
-"<widget name='PluginsPath' "
-"height='Globals.Line.Height' "
-"/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='ThemeButton' "
-"type='Button' "
+"<dialog name='LoomTownsDifficultyDialog' overlays='screen_center'> "
+"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"<widget name='Description1' "
+"width='280' "
+"height='Globals.Line.Height' "
 "/> "
-"<widget name='CurTheme' "
+"<widget name='Description2' "
 "height='Globals.Line.Height' "
 "/> "
+"<widget name='Standard' "
+"type='Button' "
+"/> "
+"<widget name='Practice' "
+"type='Button' "
+"/> "
+"<widget name='Expert' "
+"type='Button' "
+"/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='RendererPopupDesc' "
-"width='80' "
+"</dialog> "
+"<dialog name='MassAdd' overlays='screen_center' shading='dim'> "
+"<layout type='vertical' padding='4,4,16,4' center='true'> "
+"<widget name='DirProgressText' "
+"width='280' "
 "height='Globals.Line.Height' "
-"textalign='right' "
 "/> "
-"<widget name='RendererPopup' "
-"type='PopUp' "
+"<widget name='GameProgressText' "
+"width='280' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='GameList' "
+"width='280' "
+"height='100' "
+"/> "
+"<layout type='horizontal' padding='4,4,4,4'> "
+"<widget name='Ok' "
+"type='Button' "
+"/> "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='AutosavePeriodPopupDesc' "
-"width='80' "
-"height='Globals.Line.Height' "
-"textalign='right' "
+"</layout> "
+"</dialog> "
+"<dialog name='KeyMapper' overlays='screen_center' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,8' spacing='10' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='PopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='AutosavePeriodPopup' "
+"<widget name='Popup' "
 "type='PopUp' "
+"width='150' "
+"height='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='GuiLanguagePopupDesc' "
-"width='80' "
+"<widget name='KeymapArea' "
+"width='300' "
+"height='120' "
+"/> "
+"<widget name='Close' "
+"type='Button' "
+"/> "
+"</layout> "
+"</dialog> "
+"</layout_info> "
+"<layout_info resolution='y>399'> "
+"<globals> "
+"<def var='Line.Height' value='16' /> "
+"<def var='Font.Height' value='16' /> "
+"<def var='About.OuterBorder' value='80'/> "
+"<def var='Layout.Spacing' value='8' /> "
+"<def var='ShowLauncherLogo' value='0'/> "
+"<def var='ShowGlobalMenuLogo' value='0'/> "
+"<def var='ShowSearchPic' value='0'/> "
+"<def var='SaveLoadChooser.ExtInfo.Visible' value='1'/> "
+"<def var='KeyMapper.Spacing' value='10'/> "
+"<def var='KeyMapper.LabelWidth' value='100'/> "
+"<def var='KeyMapper.ButtonWidth' value='80'/> "
+"<def var='Tooltip.MaxWidth' value='200'/> "
+"<def var='Tooltip.XDelta' value='16'/> "
+"<def var='Tooltip.YDelta' value='16'/> "
+"<widget name='OptionsLabel' "
+"size='110,Globals.Line.Height' "
+"textalign='right' "
+"/> "
+"<widget name='SmallLabel' "
+"size='24,Globals.Line.Height' "
+"/> "
+"<widget name='ShortOptionsLabel' "
+"size='60,Globals.Line.Height' "
+"/> "
+"<widget name='Button' "
+"size='108,24' "
+"/> "
+"<widget name='Slider' "
+"size='128,18' "
+"/> "
+"<widget name='PopUp' "
+"size='-1,19' "
+"/> "
+"<widget name='Checkbox' "
+"size='-1,14' "
+"/> "
+"<widget name='Radiobutton' "
+"size='-1,Globals.Line.Height' "
+"/> "
+"<widget name='ListWidget' "
+"padding='5,0,8,0' "
+"/> "
+"<widget name='PopUpWidget' "
+"padding='7,5,0,0' "
+"/> "
+"<widget name='EditTextWidget' "
+"padding='5,5,0,0' "
+"/> "
+"<widget name='Console' "
+"padding='7,5,5,5' "
+"/> "
+"<widget name='Scrollbar' "
+"size='15,0' "
+"/> "
+"<widget name='TabWidget.Tab' "
+"size='75,27' "
+"padding='0,0,8,0' "
+"/> "
+"<widget name='TabWidget.Body' "
+"padding='0,0,0,0' "
+"/> "
+"<widget name='TabWidget.NavButton' "
+"size='15,18' "
+"padding='0,3,4,0' "
+"/> "
+"</globals> "
+"<dialog name='Launcher' overlays='screen'> "
+"<layout type='vertical' center='true' padding='16,16,8,8'> "
+"<widget name='Version' "
+"height='Globals.Line.Height' "
+"/> "
+"<layout type='horizontal' spacing='5' padding='10,0,0,0'> "
+"<widget name='SearchDesc' "
+"width='60' "
 "height='Globals.Line.Height' "
 "textalign='right' "
 "/> "
-"<widget name='GuiLanguagePopup' "
-"type='PopUp' "
+"<widget name='Search' "
+"width='150' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='SearchClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
+"<space /> "
 "</layout> "
-"<widget name='KeysButton' "
-"type='Button' "
+"<widget name='GameList'/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='LoadGameButton' "
+"height='20' "
+"/> "
+"<widget name='AddGameButton' "
+"height='20' "
+"/> "
+"<widget name='EditGameButton' "
+"height='20' "
+"/> "
+"<widget name='RemoveGameButton' "
+"height='20' "
+"/> "
+"</layout> "
+"<space size='4'/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='QuitButton' "
+"height='20' "
+"/> "
+"<widget name='AboutButton' "
+"height='20' "
+"/> "
+"<widget name='OptionsButton' "
+"height='20' "
+"/> "
+"<widget name='StartButton' "
+"height='20' "
 "/> "
 "</layout> "
+"</layout> "
 "</dialog> "
-"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
-"<widget name='Action' "
+"<dialog name='Browser' overlays='Dialog.Launcher.GameList' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,8'> "
+"<widget name='Headline' "
 "height='Globals.Line.Height' "
 "/> "
-"<widget name='List'/> "
-"<widget name='Mapping' "
+"<widget name='Path' "
 "height='Globals.Line.Height' "
 "/> "
-"<space size='Globals.Line.Height'/> "
-"<layout type='horizontal'> "
-"<widget name='Map' "
+"<widget name='List'/> "
+"<layout type='horizontal' padding='0,0,16,0'> "
+"<widget name='Up' "
 "type='Button' "
 "/> "
 "<space/> "
 "<widget name='Cancel' "
 "type='Button' "
 "/> "
-"<widget name='Ok' "
+"<widget name='Choose' "
 "type='Button' "
 "/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='GameOptions' overlays='screen' inset='16' shading='dim'> "
-"<layout type='vertical' padding='0,0,0,0' spacing='16'> "
+"<dialog name='GlobalOptions' overlays='Dialog.Launcher.GameList' shading='dim'> "
+"<layout type='vertical' padding='0,0,0,0'> "
 "<widget name='TabWidget'/> "
-"<layout type='horizontal' padding='8,8,8,8'> "
+"<layout type='horizontal' padding='16,16,16,16'> "
 "<space/> "
 "<widget name='Cancel' "
 "type='Button' "
@@ -1296,177 +1588,92 @@
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='GameOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
-"<widget name='EnableTabCheckbox' "
-"type='Checkbox' "
+"<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='grModePopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='grModePopup' "
+"type='PopUp' "
 "/> "
-"<import layout='Dialog.GlobalOptions_Graphics' /> "
 "</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
-"<widget name='EnableTabCheckbox' "
-"type='Checkbox' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='grRenderPopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='grRenderPopup' "
+"type='PopUp' "
 "/> "
-"<import layout='Dialog.GlobalOptions_Audio' /> "
 "</layout> "
-"</dialog> "
-"<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
-"<widget name='EnableTabCheckbox' "
+"<widget name='grAspectCheckbox' "
 "type='Checkbox' "
 "/> "
-"<import layout='Dialog.GlobalOptions_MIDI' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
-"<widget name='EnableTabCheckbox' "
+"<widget name='grFullscreenCheckbox' "
 "type='Checkbox' "
 "/> "
-"<import layout='Dialog.GlobalOptions_MT32' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
-"<widget name='EnableTabCheckbox' "
+"<widget name='grDisableDitheringCheckbox' "
 "type='Checkbox' "
 "/> "
-"<import layout='Dialog.GlobalOptions_Volume' /> "
 "</layout> "
 "</dialog> "
-"<dialog name='GameOptions_Game' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='Id' "
-"width='35' "
-"height='Globals.Line.Height' "
-"textalign='right' "
+"<dialog name='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='auMidiPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='Domain' "
+"<widget name='auMidiPopup' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='Name' "
-"width='35' "
-"height='Globals.Line.Height' "
-"textalign='right' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='auOPLPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='Desc' "
+"<widget name='auOPLPopup' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<space size='8'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='LangPopupDesc' "
-"width='60' "
-"height='Globals.Line.Height' "
-"textalign='right' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='auSampleRatePopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='LangPopup' "
+"<widget name='auSampleRatePopup' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='PlatformPopupDesc' "
-"width='60' "
-"height='Globals.Line.Height' "
-"textalign='right' "
-"/> "
-"<widget name='PlatformPopup' "
-"type='PopUp' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='subToggleDesc' "
+"type='OptionsLabel' "
 "/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Paths' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
-"<widget name='Savepath' "
-"type='Button' "
+"<widget name='subToggleSpeechOnly' "
+"type='Radiobutton' "
 "/> "
-"<widget name='SavepathText' "
-"height='Globals.Line.Height' "
+"<widget name='subToggleSubOnly' "
+"type='Radiobutton' "
 "/> "
-"<widget name='SavePathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<widget name='subToggleSubBoth' "
+"type='Radiobutton' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
-"<widget name='Extrapath' "
-"type='Button' "
-"/> "
-"<widget name='ExtrapathText' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='ExtraPathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='subSubtitleSpeedDesc' "
+"type='OptionsLabel' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
-"<widget name='Gamepath' "
-"type='Button' "
+"<widget name='subSubtitleSpeedSlider' "
+"type='Slider' "
 "/> "
-"<widget name='GamepathText' "
-"height='Globals.Line.Height' "
+"<widget name='subSubtitleSpeedLabel' "
+"type='SmallLabel' "
 "/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='GlobalMenu' overlays='screen_center'> "
-"<layout type='vertical' padding='2,2,4,6' center='true' spacing='6'> "
-"<widget name='Title' "
-"width='160' "
-"height='4' "
-"/> "
-"<widget name='Version' "
-"width='160' "
-"height='4' "
-"/> "
-"<space size='1'/> "
-"<widget name='Load' "
-"width='120' "
-"height='12' "
-"/> "
-"<widget name='Save' "
-"width='120' "
-"height='12' "
-"/> "
-"<space size='1'/> "
-"<widget name='Options' "
-"width='120' "
-"height='12' "
-"/> "
-"<widget name='Help' "
-"width='120' "
-"height='12' "
-"/> "
-"<widget name='About' "
-"width='120' "
-"height='12' "
-"/> "
-"<space size='1'/> "
-"<widget name='Resume' "
-"width='120' "
-"height='12' "
-"/> "
-"<widget name='RTL' "
-"width='120' "
-"height='12' "
-"/> "
-"<widget name='Quit' "
-"width='120' "
-"height='12' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalConfig' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<dialog name='GlobalOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='horizontal' padding='16,16,16,16' spacing='8'> "
+"<layout type='vertical' padding='0,0,0,0' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0'> "
 "<widget name='vcMusicText' "
 "type='OptionsLabel' "
 "/> "
@@ -1477,7 +1684,7 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0'> "
 "<widget name='vcSfxText' "
 "type='OptionsLabel' "
 "/> "
@@ -1488,7 +1695,7 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0'> "
 "<widget name='vcSpeechText' "
 "type='OptionsLabel' "
 "/> "
@@ -1499,764 +1706,557 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<space size='110' /> "
+"</layout> "
+"<layout type='vertical' padding='24,0,24,0' center='true'> "
 "<widget name='vcMuteCheckbox' "
 "type='Checkbox' "
-"width='80' "
 "/> "
 "</layout> "
-"<layout type='vertical' padding='0,0,0,0' spacing='1' center='true'> "
-"<widget name='subToggleDesc' "
+"</layout> "
+"</dialog> "
+"<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='auPrefGmPopupDesc' "
 "type='OptionsLabel' "
 "/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='subToggleSpeechOnly' "
-"type='Radiobutton' "
-"width='90' "
+"<widget name='auPrefGmPopup' "
+"type='PopUp' "
 "/> "
-"<widget name='subToggleSubOnly' "
-"type='Radiobutton' "
-"width='90' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='mcFontButton' "
+"type='Button' "
 "/> "
-"<widget name='subToggleSubBoth' "
-"type='Radiobutton' "
-"width='90' "
+"<widget name='mcFontPath' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='mcFontClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
 "</layout> "
-"</layout> "
-"<space size='2' /> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='subSubtitleSpeedDesc' "
+"<widget name='mcMixedCheckbox' "
+"type='Checkbox' "
+"/> "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<widget name='mcMidiGainText' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='subSubtitleSpeedSlider' "
+"<widget name='mcMidiGainSlider' "
 "type='Slider' "
 "/> "
-"<widget name='subSubtitleSpeedLabel' "
-"type='SmallLabel' "
+"<widget name='mcMidiGainLabel' "
+"width='32' "
+"height='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<space size='16'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='4'> "
-"<widget name='Keys' "
-"type='Button' "
-"/> "
-"<space size='Globals.Button.Width' /> "
-"<widget name='Cancel' "
-"type='Button' "
+"</layout> "
+"</dialog> "
+"<dialog name='GlobalOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='auPrefMt32PopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='Ok' "
-"type='Button' "
+"<widget name='auPrefMt32Popup' "
+"type='PopUp' "
 "/> "
 "</layout> "
+"<widget name='mcMt32Checkbox' "
+"type='Checkbox' "
+"/> "
+"<widget name='mcGSCheckbox' "
+"type='Checkbox' "
+"/> "
 "</layout> "
 "</dialog> "
-"<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
-"<widget name='Title' height='Globals.Line.Height'/> "
-"<widget name='List' /> "
-"<layout type='horizontal' padding='0,0,16,0'> "
-"<space/> "
-"<widget name='Delete' "
-"type='Button' "
-"/> "
-"<space size='16'/> "
-"<widget name='Cancel' "
+"<dialog name='GlobalOptions_Paths' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='SaveButton' "
 "type='Button' "
 "/> "
-"<widget name='Choose' "
-"type='Button' "
+"<widget name='SavePath' "
+"height='Globals.Line.Height' "
 "/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='ScummHelp' overlays='screen'> "
-"<layout type='vertical' padding='8,8,8,8'> "
-"<widget name='Title' "
-"width='180' "
+"<widget name='SavePathClearButton' "
 "height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
-"<widget name='HelpText' "
-"height='140' "
-"/> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<widget name='Prev' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='ThemeButton' "
 "type='Button' "
 "/> "
-"<widget name='Next' "
+"<widget name='ThemePath' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='ThemePathClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='ExtraButton' "
 "type='Button' "
 "/> "
-"<space size='32'/> "
-"<widget name='Close' "
+"<widget name='ExtraPath' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='ExtraPathClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='PluginsButton' "
 "type='Button' "
 "/> "
+"<widget name='PluginsPath' "
+"height='Globals.Line.Height' "
+"/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='LoomTownsDifficultyDialog' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
-"<widget name='Description1' "
-"width='280' "
-"height='Globals.Line.Height' "
+"<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='ThemeButton' "
+"type='Button' "
 "/> "
-"<widget name='Description2' "
+"<widget name='CurTheme' "
 "height='Globals.Line.Height' "
 "/> "
-"<widget name='Standard' "
-"type='Button' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='RendererPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='Practice' "
-"type='Button' "
+"<widget name='RendererPopup' "
+"type='PopUp' "
 "/> "
-"<widget name='Expert' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='AutosavePeriodPopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='AutosavePeriodPopup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='GuiLanguagePopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='GuiLanguagePopup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<widget name='KeysButton' "
 "type='Button' "
 "/> "
 "</layout> "
 "</dialog> "
-"<dialog name='MassAdd' overlays='screen_center' shading='dim'> "
-"<layout type='vertical' padding='4,4,16,4' center='true'> "
-"<widget name='DirProgressText' "
-"width='280' "
+"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"<widget name='Action' "
 "height='Globals.Line.Height' "
 "/> "
-"<widget name='GameProgressText' "
-"width='280' "
+"<widget name='List'/> "
+"<widget name='Mapping' "
 "height='Globals.Line.Height' "
 "/> "
-"<widget name='GameList' "
-"width='280' "
-"height='100' "
-"/> "
-"<layout type='horizontal' padding='4,4,4,4'> "
-"<widget name='Ok' "
+"<space size='Globals.Line.Height'/> "
+"<layout type='horizontal'> "
+"<widget name='Map' "
 "type='Button' "
 "/> "
+"<space/> "
 "<widget name='Cancel' "
 "type='Button' "
 "/> "
+"<widget name='Ok' "
+"type='Button' "
+"/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='KeyMapper' overlays='screen_center' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='10' center='true'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='PopupDesc' "
-"type='OptionsLabel' "
+"<dialog name='GameOptions' overlays='Dialog.Launcher.GameList' shading='dim'> "
+"<layout type='vertical' padding='0,0,0,0' spacing='16'> "
+"<widget name='TabWidget'/> "
+"<layout type='horizontal' padding='16,16,16,4'> "
+"<space/> "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
-"<widget name='Popup' "
-"type='PopUp' "
-"width='150' "
-"height='Globals.Line.Height' "
+"<widget name='Ok' "
+"type='Button' "
 "/> "
 "</layout> "
-"<widget name='KeymapArea' "
-"width='300' "
-"height='120' "
+"</layout> "
+"</dialog> "
+"<dialog name='GameOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<widget name='EnableTabCheckbox' "
+"type='Checkbox' "
 "/> "
-"<widget name='Close' "
-"type='Button' "
+"<import layout='Dialog.GlobalOptions_Graphics' /> "
+"</layout> "
+"</dialog> "
+"<dialog name='GameOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<widget name='EnableTabCheckbox' "
+"type='Checkbox' "
 "/> "
+"<import layout='Dialog.GlobalOptions_Audio' /> "
 "</layout> "
 "</dialog> "
-"</layout_info> "
-"<render_info> "
-"<palette> "
-"<color name='black' "
-"rgb='0,0,0' "
+"<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<widget name='EnableTabCheckbox' "
+"type='Checkbox' "
 "/> "
-"<color name='lightgrey' "
-"rgb='104,104,104' "
+"<import layout='Dialog.GlobalOptions_MIDI' /> "
+"</layout> "
+"</dialog> "
+"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<widget name='EnableTabCheckbox' "
+"type='Checkbox' "
 "/> "
-"<color name='darkgrey' "
-"rgb='64,64,64' "
+"<import layout='Dialog.GlobalOptions_MT32' /> "
+"</layout> "
+"</dialog> "
+"<dialog name='GameOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<widget name='EnableTabCheckbox' "
+"type='Checkbox' "
 "/> "
-"<color name='green' "
-"rgb='32,160,32' "
+"<import layout='Dialog.GlobalOptions_Volume' /> "
+"</layout> "
+"</dialog> "
+"<dialog name='GameOptions_Game' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
+"<layout type='vertical' padding='16,16,16,16'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='Id' "
+"type='OptionsLabel' "
 "/> "
-"<color name='green2' "
-"rgb='0,255,0' "
+"<widget name='Domain' "
+"type='PopUp' "
 "/> "
-"</palette> "
-"<fonts> "
-"<font id='text_default' "
-"file='helvb12.bdf' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='Name' "
+"type='OptionsLabel' "
 "/> "
-"<font resolution='y<400' "
-"id='text_default' "
-"file='clR6x12.bdf' "
+"<widget name='Desc' "
+"type='PopUp' "
 "/> "
-"<font id='text_button' "
-"file='helvb12.bdf' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='LangPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<font resolution='y<400' "
-"id='text_button' "
-"file='clR6x12.bdf' "
+"<widget name='LangPopup' "
+"type='PopUp' "
 "/> "
-"<font id='text_normal' "
-"file='helvb12.bdf' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='PlatformPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<font resolution='y<400' "
-"id='text_normal' "
-"file='clR6x12.bdf' "
+"<widget name='PlatformPopup' "
+"type='PopUp' "
 "/> "
-"<font id='tooltip_normal' "
-"file='fixed5x8.bdf' "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='GameOptions_Paths' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
+"<layout type='vertical' padding='16,16,16,16'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='Savepath' "
+"type='Button' "
 "/> "
-"<text_color id='color_normal' "
-"color='green' "
+"<widget name='SavepathText' "
+"height='Globals.Line.Height' "
 "/> "
-"<text_color id='color_normal_inverted' "
-"color='black' "
+"<widget name='SavePathClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
-"<text_color id='color_normal_hover' "
-"color='green2' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='Extrapath' "
+"type='Button' "
 "/> "
-"<text_color id='color_normal_disabled' "
-"color='lightgrey' "
+"<widget name='ExtrapathText' "
+"height='Globals.Line.Height' "
 "/> "
-"<text_color id='color_alternative' "
-"color='lightgrey' "
+"<widget name='ExtraPathClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
-"<text_color id='color_alternative_inverted' "
-"color='255,255,255' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='Gamepath' "
+"type='Button' "
 "/> "
-"<text_color id='color_alternative_hover' "
-"color='176,176,176' "
+"<widget name='GamepathText' "
+"height='Globals.Line.Height' "
 "/> "
-"<text_color id='color_alternative_disabled' "
-"color='darkgrey' "
-"/> "
-"<text_color id='color_button' "
-"color='green' "
-"/> "
-"<text_color id='color_button_hover' "
-"color='green2' "
-"/> "
-"<text_color id='color_button_disabled' "
-"color='lightgrey' "
-"/> "
-"</fonts> "
-"<defaults fill='foreground' fg_color='darkgrey' bg_color='black' shadow='0' bevel_color='lightgrey'/> "
-"<drawdata id='text_selection' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='lightgrey' "
-"/> "
-"</drawdata> "
-"<drawdata id='text_selection_focus' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green' "
-"/> "
-"</drawdata> "
-"<drawdata id='mainmenu_bg' cache='false'> "
-"<drawstep func='fill' "
-"fill='foreground' "
-"fg_color='black' "
-"/> "
-"</drawdata> "
-"<drawdata id='special_bg' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"/> "
-"</drawdata> "
-"<drawdata id='tooltip_bg' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='foreground' "
-"fg_color='black' "
-"/> "
-"</drawdata> "
-"<drawdata id='separator' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"height='2' "
-"ypos='center' "
-"fg_color='lightgrey' "
-"/> "
-"</drawdata> "
-"<drawdata id='scrollbar_base' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"/> "
-"</drawdata> "
-"<drawdata id='scrollbar_handle_hover' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green2' "
-"/> "
-"</drawdata> "
-"<drawdata id='scrollbar_handle_idle' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green' "
-"/> "
-"</drawdata> "
-"<drawdata id='scrollbar_button_idle' cache='false' resolution='y>399'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='10' "
-"height='10' "
-"xpos='right' "
-"ypos='center' "
-"padding='0,0,3,0' "
-"orientation='top' "
-"/> "
-"</drawdata> "
-"<drawdata id='scrollbar_button_idle' cache='false' resolution='y<400'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='5' "
-"height='5' "
-"xpos='right' "
-"ypos='center' "
-"padding='0,0,2,0' "
-"orientation='top' "
-"/> "
-"</drawdata> "
-"<drawdata id='scrollbar_button_hover' cache='false' resolution='y>399'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='10' "
-"height='10' "
-"xpos='right' "
-"ypos='center' "
-"padding='0,0,3,0' "
-"orientation='top' "
-"/> "
-"</drawdata> "
-"<drawdata id='scrollbar_button_hover' cache='false' resolution='y<400'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='5' "
-"height='5' "
-"xpos='right' "
-"ypos='center' "
-"padding='0,0,2,0' "
-"orientation='top' "
-"/> "
-"</drawdata> "
-"<drawdata id='tab_active' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal_hover' "
-"vertical_align='center' "
-"horizontal_align='center' "
-"/> "
-"<drawstep func='tab' "
-"bevel='2' "
-"radius='0' "
-"fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='tab_inactive' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='center' "
-"/> "
-"<drawstep func='tab' "
-"bevel='2' "
-"radius='0' "
-"fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='tab_background' cache='false'> "
-"</drawdata> "
-"<drawdata id='widget_slider' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='slider_disabled' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='lightgrey' "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='GlobalMenu' overlays='screen_center'> "
+"<layout type='vertical' padding='16,16,16,16' center='true'> "
+"<widget name='Title' "
+"width='210' "
+"height='Globals.Line.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id='slider_full' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green' "
+"<widget name='Version' "
+"width='210' "
+"height='Globals.Line.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id='slider_hover' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green2' "
+"<widget name='Resume' "
+"width='150' "
+"height='Globals.Button.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id='widget_small' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<space size='10'/> "
+"<widget name='Load' "
+"width='150' "
+"height='Globals.Button.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id='popup_idle' cache='false' resolution='y>399'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='Save' "
+"width='150' "
+"height='Globals.Button.Height' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='10' "
-"height='5' "
-"xpos='right' "
-"ypos='10' "
-"padding='0,0,7,0' "
-"orientation='bottom' "
+"<space size='10'/> "
+"<widget name='Options' "
+"width='150' "
+"height='Globals.Button.Height' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='10' "
-"height='5' "
-"xpos='right' "
-"ypos='4' "
-"padding='0,0,7,0' "
-"orientation='top' "
+"<widget name='Help' "
+"width='150' "
+"height='Globals.Button.Height' "
 "/> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='About' "
+"width='150' "
+"height='Globals.Button.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id='popup_idle' cache='false' resolution='y<400'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<space size='10'/> "
+"<widget name='RTL' "
+"width='150' "
+"height='Globals.Button.Height' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='7' "
-"height='4' "
-"xpos='right' "
-"ypos='9' "
-"padding='0,0,3,0' "
-"orientation='bottom' "
+"<widget name='Quit' "
+"width='150' "
+"height='Globals.Button.Height' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='7' "
-"height='4' "
-"xpos='right' "
-"ypos='4' "
-"padding='0,0,3,0' "
-"orientation='top' "
+"</layout> "
+"</dialog> "
+"<dialog name='GlobalConfig' overlays='screen_center'> "
+"<layout type='vertical' padding='8,8,8,8'> "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<layout type='vertical' padding='0,0,0,0' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<widget name='vcMusicText' "
+"type='OptionsLabel' "
 "/> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='vcMusicSlider' "
+"type='Slider' "
 "/> "
-"</drawdata> "
-"<drawdata id='popup_disabled' cache='false' resolution='y>399'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='vcMusicLabel' "
+"type='SmallLabel' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='10' "
-"height='5' "
-"xpos='right' "
-"ypos='10' "
-"padding='0,0,7,0' "
-"orientation='bottom' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<widget name='vcSfxText' "
+"type='OptionsLabel' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='10' "
-"height='5' "
-"xpos='right' "
-"ypos='4' "
-"padding='0,0,7,0' "
-"orientation='top' "
+"<widget name='vcSfxSlider' "
+"type='Slider' "
 "/> "
-"<text font='text_default' "
-"text_color='color_normal_disabled' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='vcSfxLabel' "
+"type='SmallLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id='popup_disabled' cache='false' resolution='y<400'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<widget name='vcSpeechText' "
+"type='OptionsLabel' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='7' "
-"height='4' "
-"xpos='right' "
-"ypos='9' "
-"padding='0,0,3,0' "
-"orientation='bottom' "
+"<widget name='vcSpeechSlider' "
+"type='Slider' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='7' "
-"height='4' "
-"xpos='right' "
-"ypos='4' "
-"padding='0,0,3,0' "
-"orientation='top' "
+"<widget name='vcSpeechLabel' "
+"type='SmallLabel' "
 "/> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"</layout> "
+"</layout> "
+"<layout type='vertical' padding='24,24,24,24' center='true'> "
+"<widget name='vcMuteCheckbox' "
+"type='Checkbox' "
+"width='80'  "
 "/> "
-"</drawdata> "
-"<drawdata id='popup_hover' cache='false' resolution='y>399'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"</layout> "
+"</layout> "
+"<space size='8' /> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='subToggleDesc' "
+"type='OptionsLabel' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='10' "
-"height='5' "
-"xpos='right' "
-"ypos='10' "
-"padding='0,0,7,0' "
-"orientation='bottom' "
+"<widget name='subToggleSpeechOnly' "
+"type='Radiobutton' "
+"width='100' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='10' "
-"height='5' "
-"xpos='right' "
-"ypos='4' "
-"padding='0,0,7,0' "
-"orientation='top' "
+"<widget name='subToggleSubOnly' "
+"type='Radiobutton' "
+"width='100' "
 "/> "
-"<text font='text_default' "
-"text_color='color_normal_hover' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='subToggleSubBoth' "
+"type='Radiobutton' "
+"width='100' "
 "/> "
-"</drawdata> "
-"<drawdata id='popup_hover' cache='false' resolution='y<400'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='subSubtitleSpeedDesc' "
+"type='OptionsLabel' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='7' "
-"height='4' "
-"xpos='right' "
-"ypos='9' "
-"padding='0,0,3,0' "
-"orientation='bottom' "
+"<widget name='subSubtitleSpeedSlider' "
+"type='Slider' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='7' "
-"height='4' "
-"xpos='right' "
-"ypos='4' "
-"padding='0,0,3,0' "
-"orientation='top' "
+"<widget name='subSubtitleSpeedLabel' "
+"type='SmallLabel' "
 "/> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"</layout> "
+"<space size='60'/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='Keys' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='widget_textedit' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<space size='Globals.Button.Width' /> "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='plain_bg' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
+"<widget name='Ok' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='caret' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='lightgrey' "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,32' center='true'> "
+"<widget name='Title' "
+"height='Globals.Line.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id='default_bg' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
+"<layout type='horizontal' padding='0,0,0,16' spacing='16'> "
+"<widget name='List' /> "
+"<widget name='Thumbnail' "
+"width='180' "
+"height='200' "
 "/> "
-"</drawdata> "
-"<drawdata id='button_idle' cache='false'> "
-"<text font='text_button' "
-"text_color='color_button' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<space/> "
+"<widget name='Delete' "
+"type='Button' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<space size='32'/> "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='button_hover' cache='false'> "
-"<text font='text_button' "
-"text_color='color_button_hover' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"<widget name='Choose' "
+"type='Button' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='ScummHelp' overlays='screen_center'> "
+"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"<widget name='Title' "
+"width='320' "
+"height='Globals.Line.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id='button_disabled' cache='false'> "
-"<text font='text_button' "
-"text_color='color_button_disabled' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"<widget name='HelpText' "
+"height='200' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<layout type='horizontal' padding='0,0,16,0'> "
+"<widget name='Prev' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='checkbox_disabled' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal_disabled' "
-"vertical_align='top' "
-"horizontal_align='left' "
+"<widget name='Next' "
+"type='Button' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<space size='32'/> "
+"<widget name='Close' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='checkbox_selected' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='top' "
-"horizontal_align='left' "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='LoomTownsDifficultyDialog' overlays='screen_center'> "
+"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"<widget name='Description1' "
+"width='320' "
+"height='Globals.Line.Height' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='Description2' "
+"height='Globals.Line.Height' "
 "/> "
-"<drawstep func='cross' "
-"fill='foreground' "
-"stroke='2' "
-"fg_color='green' "
+"<widget name='Standard' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='checkbox_default' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='top' "
-"horizontal_align='left' "
+"<widget name='Practice' "
+"type='Button' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='Expert' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='radiobutton_default' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"</layout> "
+"</dialog> "
+"<dialog name='MassAdd' overlays='screen_center' shading='dim'> "
+"<layout type='vertical' padding='8,8,32,8' center='true'> "
+"<widget name='DirProgressText' "
+"width='480' "
+"height='Globals.Line.Height' "
 "/> "
-"<drawstep func='circle' "
-"width='7' "
-"height='7' "
-"radius='7' "
-"fill='background' "
-"bg_color='darkgrey' "
-"xpos='0' "
-"ypos='0' "
+"<widget name='GameProgressText' "
+"width='480' "
+"height='Globals.Line.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id='radiobutton_selected' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='GameList' "
+"width='480' "
+"height='250' "
 "/> "
-"<drawstep func='circle' "
-"width='7' "
-"height='7' "
-"radius='7' "
-"fg_color='darkgrey' "
-"fill='none' "
-"xpos='0' "
-"ypos='0' "
+"<layout type='horizontal' padding='8,8,8,8'> "
+"<widget name='Ok' "
+"type='Button' "
 "/> "
-"<drawstep func='circle' "
-"width='7' "
-"height='7' "
-"radius='5' "
-"fg_color='green' "
-"fill='foreground' "
-"xpos='2' "
-"ypos='2' "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='radiobutton_disabled' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal_disabled' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='KeyMapper' overlays='screen_center' shading='dim'> "
+"<layout type='vertical' padding='8,8,32,8' spacing='10' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='PopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<drawstep func='circle' "
-"width='7' "
-"height='7' "
-"radius='7' "
-"bg_color='lightgrey' "
-"fill='background' "
-"xpos='0' "
-"ypos='0' "
+"<widget name='Popup' "
+"type='PopUp' "
+"width='400' "
+"height='Globals.Line.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id='widget_default' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
+"</layout> "
+"<widget name='KeymapArea' "
+"width='600' "
+"height='280' "
 "/> "
-"</drawdata> "
-"<drawdata id='widget_small' cache='false'> "
-"<drawstep func='square' "
-"stroke='0' "
+"<widget name='Close' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"</render_info> "
+"</layout> "
+"</dialog> "
+"</layout_info> "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index c2df75c..8b2a3e7 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC
index 0e1dcc5..f3904cb 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.7:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.8.8:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 867cf91..d829e4a 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC
index d3abf43..32bd362 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.7:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.8.8:ScummVM Modern Theme:No Author]
diff --git a/gui/themes/scummtheme.py b/gui/themes/scummtheme.py
index e4e9549..4c55fd7 100755
--- a/gui/themes/scummtheme.py
+++ b/gui/themes/scummtheme.py
@@ -5,7 +5,7 @@ import re
 import os
 import zipfile
 
-THEME_FILE_EXTENSIONS = ('.stx', '.bmp', '.fcc')
+THEME_FILE_EXTENSIONS = ('.stx', '.bmp', '.fcc', '.ttf')
 
 def buildTheme(themeName):
 	if not os.path.isdir(themeName) or not os.path.isfile(os.path.join(themeName, "THEMERC")):


Commit: 9f3fbe1bd773664b1e86241e71875cd97230d791
    https://github.com/scummvm/scummvm/commit/9f3fbe1bd773664b1e86241e71875cd97230d791
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-01-29T07:26:20-08:00

Commit Message:
GRAPHICS/GUI: Implement kerning support for Font.

This adapts the related graphics code, which is the generic Font API and the
TTF font implementation.

It furthermore adapts the GUI to properly take care of kerning in text input
widgets.

Changed paths:
    graphics/font.cpp
    graphics/font.h
    graphics/fonts/ttf.cpp
    gui/ThemeEngine.cpp
    gui/ThemeEngine.h
    gui/gui-manager.h
    gui/widgets/editable.cpp
    gui/widgets/edittext.cpp



diff --git a/graphics/font.cpp b/graphics/font.cpp
index 3f7152a..8775bcc 100644
--- a/graphics/font.cpp
+++ b/graphics/font.cpp
@@ -26,11 +26,20 @@
 
 namespace Graphics {
 
+int Font::getKerningOffset(byte left, byte right) const {
+	return 0;
+}
+
 int Font::getStringWidth(const Common::String &str) const {
 	int space = 0;
+	uint last = 0;
+
+	for (uint i = 0; i < str.size(); ++i) {
+		const uint cur = str[i];
+		space += getCharWidth(cur) + getKerningOffset(last, cur);
+		last = cur;
+	}
 
-	for (uint i = 0; i < str.size(); ++i)
-		space += getCharWidth(str[i]);
 	return space;
 }
 
@@ -65,17 +74,22 @@ void Font::drawString(Surface *dst, const Common::String &sOld, int x, int y, in
 		// for now.
 		const int halfWidth = (w - ellipsisWidth) / 2;
 		int w2 = 0;
+		uint last = 0;
 
 		for (i = 0; i < s.size(); ++i) {
-			int charWidth = getCharWidth(s[i]);
+			const uint cur = s[i];
+			int charWidth = getCharWidth(cur) + getKerningOffset(last, cur);
 			if (w2 + charWidth > halfWidth)
 				break;
+			last = cur;
 			w2 += charWidth;
-			str += s[i];
+			str += cur;
 		}
+
 		// At this point we know that the first 'i' chars are together 'w2'
 		// pixels wide. We took the first i-1, and add "..." to them.
 		str += "...";
+		last = '.';
 
 		// The original string is width wide. Of those we already skipped past
 		// w2 pixels, which means (width - w2) remain.
@@ -85,7 +99,9 @@ void Font::drawString(Surface *dst, const Common::String &sOld, int x, int y, in
 		// (width + ellipsisWidth - w)
 		int skip = width + ellipsisWidth - w;
 		for (; i < s.size() && skip > 0; ++i) {
-			skip -= getCharWidth(s[i]);
+			const uint cur = s[i];
+			skip -= getCharWidth(cur) + getKerningOffset(last, cur);
+			last = cur;
 		}
 
 		// Append the remaining chars, if any
@@ -104,8 +120,12 @@ void Font::drawString(Surface *dst, const Common::String &sOld, int x, int y, in
 		x = x + w - width;
 	x += deltax;
 
+	uint last = 0;
 	for (i = 0; i < str.size(); ++i) {
-		w = getCharWidth(str[i]);
+		const uint cur = str[i];
+		x += getKerningOffset(last, cur);
+		last = cur;
+		w = getCharWidth(cur);
 		if (x+w > rightX)
 			break;
 		if (x >= leftX)
@@ -153,9 +173,11 @@ int Font::wordWrapText(const Common::String &str, int maxWidth, Common::Array<Co
 	// of a line. If we encounter such a word, we have to wrap it over multiple
 	// lines.
 
+	uint last = 0;
 	for (Common::String::const_iterator x = str.begin(); x != str.end(); ++x) {
 		const byte c = *x;
-		const int w = getCharWidth(c);
+		const int w = getCharWidth(c) + getKerningOffset(last, c);
+		last = c;
 		const bool wouldExceedWidth = (lineWidth + tmpWidth + w > maxWidth);
 
 		// If this char is a whitespace, then it represents a potential
@@ -187,8 +209,10 @@ int Font::wordWrapText(const Common::String &str, int maxWidth, Common::Array<Co
 				wrapper.add(line, lineWidth);
 				// Trim left side
 				while (tmpStr.size() && isspace(static_cast<unsigned char>(tmpStr[0]))) {
-					tmpWidth -= getCharWidth(tmpStr[0]);
 					tmpStr.deleteChar(0);
+					// This is not very fast, but it is the simplest way to
+					// assure we do not mess something up because of kerning.
+					tmpWidth = getStringWidth(tmpStr);
 				}
 			} else {
 				wrapper.add(tmpStr, tmpWidth);
diff --git a/graphics/font.h b/graphics/font.h
index 9c0b4af..6819b42 100644
--- a/graphics/font.h
+++ b/graphics/font.h
@@ -73,6 +73,15 @@ public:
 	virtual int getCharWidth(byte chr) const = 0;
 
 	/**
+	 * Query the kerning offset between two characters.
+	 *
+	 * @param left  The left character. May be 0.
+	 * @param right The right character. May be 0.
+	 * @return The horizontal displacement.
+	 */
+	virtual int getKerningOffset(byte left, byte right) const;
+
+	/**
 	 * Draw a character at a specific point on a surface.
 	 *
 	 * Note that the point describes the top left edge point of the
diff --git a/graphics/fonts/ttf.cpp b/graphics/fonts/ttf.cpp
index 8a6b87c..b5bf5c0 100644
--- a/graphics/fonts/ttf.cpp
+++ b/graphics/fonts/ttf.cpp
@@ -109,6 +109,8 @@ public:
 
 	virtual int getCharWidth(byte chr) const;
 
+	virtual int getKerningOffset(byte left, byte right) const;
+
 	virtual void drawChar(Surface *dst, byte chr, int x, int y, uint32 color) const;
 private:
 	bool _initialized;
@@ -126,16 +128,19 @@ private:
 		int advance;
 	};
 
-	bool cacheGlyph(Glyph &glyph, byte chr);
+	bool cacheGlyph(Glyph &glyph, FT_UInt &slot, uint chr);
 	typedef Common::HashMap<byte, Glyph> GlyphCache;
 	GlyphCache _glyphs;
 
+	FT_UInt _glyphSlots[256];
+
 	bool _monochrome;
+	bool _hasKerning;
 };
 
 TTFFont::TTFFont()
     : _initialized(false), _face(), _ttfFile(0), _size(0), _width(0), _height(0), _ascent(0),
-      _descent(0), _glyphs(), _monochrome(false) {
+      _descent(0), _glyphs(), _glyphSlots(), _monochrome(false), _hasKerning(false) {
 }
 
 TTFFont::~TTFFont() {
@@ -187,6 +192,9 @@ bool TTFFont::load(Common::SeekableReadStream &stream, int size, bool monochrome
 		return false;
 	}
 
+	// Check whether we have kerning support
+	_hasKerning = (FT_HAS_KERNING(_face) != 0);
+
 	if (FT_Set_Char_Size(_face, 0, size * 64, 0, 0)) {
 		delete[] _ttfFile;
 		_ttfFile = 0;
@@ -204,8 +212,10 @@ bool TTFFont::load(Common::SeekableReadStream &stream, int size, bool monochrome
 	_height = _ascent - _descent + 1;
 
 	// Load all ISO-8859-1 characters.
-	for (uint i = 0; i < 256; ++i)
-		cacheGlyph(_glyphs[i], i);
+	for (uint i = 0; i < 256; ++i) {
+		if (!cacheGlyph(_glyphs[i], _glyphSlots[i], i))
+			_glyphSlots[i] = 0;
+	}
 
 	_initialized = (_glyphs.size() != 0);
 	return _initialized;
@@ -227,6 +237,21 @@ int TTFFont::getCharWidth(byte chr) const {
 		return glyphEntry->_value.advance;
 }
 
+int TTFFont::getKerningOffset(byte left, byte right) const {
+	if (!_hasKerning)
+		return 0;
+
+	FT_UInt leftGlyph = _glyphSlots[left];
+	FT_UInt rightGlyph = _glyphSlots[right];
+
+	if (!leftGlyph || !rightGlyph)
+		return 0;
+
+	FT_Vector kerningVector;
+	FT_Get_Kerning(_face, leftGlyph, rightGlyph, FT_KERNING_DEFAULT, &kerningVector);
+	return (kerningVector.x / 64);
+}
+
 namespace {
 
 template<typename ColorType>
@@ -336,8 +361,8 @@ void TTFFont::drawChar(Surface *dst, byte chr, int x, int y, uint32 color) const
 	}
 }
 
-bool TTFFont::cacheGlyph(Glyph &glyph, byte chr) {
-	FT_UInt slot = FT_Get_Char_Index(_face, chr);
+bool TTFFont::cacheGlyph(Glyph &glyph, FT_UInt &slot, uint chr) {
+	slot = FT_Get_Char_Index(_face, chr);
 	if (!slot)
 		return false;
 
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 585789b..46a0eda 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -1373,6 +1373,10 @@ int ThemeEngine::getCharWidth(byte c, FontStyle font) const {
 	return ready() ? _texts[fontStyleToData(font)]->_fontPtr->getCharWidth(c) : 0;
 }
 
+int ThemeEngine::getKerningOffset(byte left, byte right, FontStyle font) const {
+	return ready() ? _texts[fontStyleToData(font)]->_fontPtr->getKerningOffset(left, right) : 0;
+}
+
 TextData ThemeEngine::getTextData(DrawData ddId) const {
 	return _widgets[ddId] ? (TextData)_widgets[ddId]->_textDataId : kTextDataNone;
 }
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index c49952b..f041f85 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -310,6 +310,8 @@ public:
 
 	int getCharWidth(byte c, FontStyle font = kFontStyleBold) const;
 
+	int getKerningOffset(byte left, byte right, FontStyle font = kFontStyleBold) const;
+
 	//@}
 
 
diff --git a/gui/gui-manager.h b/gui/gui-manager.h
index addd2e6..49542fd 100644
--- a/gui/gui-manager.h
+++ b/gui/gui-manager.h
@@ -81,6 +81,7 @@ public:
 	int getFontHeight(ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getFontHeight(style); }
 	int getStringWidth(const Common::String &str, ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getStringWidth(str, style); }
 	int getCharWidth(byte c, ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getCharWidth(c, style); }
+	int getKerningOffset(byte left, byte right, ThemeEngine::FontStyle font = ThemeEngine::kFontStyleBold) const { return _theme->getKerningOffset(left, right, font); }
 
 	/**
 	 * Tell the GuiManager to check whether the screen resolution has changed.
diff --git a/gui/widgets/editable.cpp b/gui/widgets/editable.cpp
index 4a0ee54..6fae934 100644
--- a/gui/widgets/editable.cpp
+++ b/gui/widgets/editable.cpp
@@ -238,8 +238,13 @@ void EditableWidget::defaultKeyDownHandler(Common::KeyState &state, bool &dirty,
 
 int EditableWidget::getCaretOffset() const {
 	int caretpos = 0;
-	for (int i = 0; i < _caretPos; i++)
-		caretpos += g_gui.getCharWidth(_editString[i], _font);
+
+	uint last = 0;
+	for (int i = 0; i < _caretPos; ++i) {
+		const uint cur = _editString[i];
+		caretpos += g_gui.getCharWidth(cur, _font) + g_gui.getKerningOffset(last, cur, _font);
+		last = cur;
+	}
 
 	caretpos -= _editScrollOffset;
 
@@ -270,6 +275,8 @@ void EditableWidget::drawCaret(bool erase) {
 		if ((uint)_caretPos < _editString.size()) {
 			GUI::EditableWidget::String chr(_editString[_caretPos]);
 			int chrWidth = g_gui.getCharWidth(_editString[_caretPos], _font);
+			const uint last = (_caretPos > 0) ? _editString[_caretPos - 1] : 0;
+			x += g_gui.getKerningOffset(last, _editString[_caretPos], _font);
 			g_gui.theme()->drawText(Common::Rect(x, y, x + chrWidth, y + editRect.height() - 2), chr, _state, Graphics::kTextAlignLeft, _inversion, 0, false, _font);
 		}
 	}
diff --git a/gui/widgets/edittext.cpp b/gui/widgets/edittext.cpp
index 0337fe1..af8ab8a 100644
--- a/gui/widgets/edittext.cpp
+++ b/gui/widgets/edittext.cpp
@@ -67,10 +67,13 @@ void EditTextWidget::handleMouseDown(int x, int y, int button, int clickCount) {
 	int width = 0;
 	uint i;
 
+	uint last = 0;
 	for (i = 0; i < _editString.size(); ++i) {
-		width += g_gui.theme()->getCharWidth(_editString[i], _font);
+		const uint cur = _editString[i];
+		width += g_gui.getCharWidth(cur, _font) + g_gui.getKerningOffset(last, cur, _font);
 		if (width >= x)
 			break;
+		last = cur;
 	}
 	if (setCaretPos(i))
 		draw();


Commit: f63df3bf7b95ddd9eaa4f55c4f21f53f3bd00f68
    https://github.com/scummvm/scummvm/commit/f63df3bf7b95ddd9eaa4f55c4f21f53f3bd00f68
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-01-29T07:26:20-08:00

Commit Message:
GRAPHICS/GUI: Implement charset mapping for TTF fonts.

The charsets used by the translations now need to have a "$(name).cp" file,
which contains an charset index => unicode mapping. Otherwise
create_translations will fail.

Changed paths:
  A devtools/create_translations/cp_parser.cpp
  A devtools/create_translations/cp_parser.h
  A po/iso-8859-2.cp
  A po/iso-8859-5.cp
    common/translation.cpp
    common/translation.h
    devtools/create_translations/create_translations.cpp
    devtools/create_translations/create_translations.h
    devtools/create_translations/module.mk
    graphics/fonts/ttf.cpp
    graphics/fonts/ttf.h
    gui/ThemeEngine.cpp
    gui/themes/translations.dat
    po/ca_ES.po
    po/cs_CZ.po
    po/da_DA.po
    po/de_DE.po
    po/es_ES.po
    po/fr_FR.po
    po/hu_HU.po
    po/it_IT.po
    po/module.mk
    po/nb_NO.po
    po/nn_NO.po
    po/pl_PL.po
    po/pt_BR.po
    po/ru_RU.po
    po/scummvm.pot
    po/se_SE.po
    po/uk_UA.po



diff --git a/common/translation.cpp b/common/translation.cpp
index 081bde9..219fce8 100644
--- a/common/translation.cpp
+++ b/common/translation.cpp
@@ -26,7 +26,7 @@
 #undef ARRAYSIZE
 #endif
 
-#define TRANSLATIONS_DAT_VER 2
+#define TRANSLATIONS_DAT_VER 3
 
 #include "common/translation.h"
 #include "common/config-manager.h"
@@ -45,7 +45,7 @@ bool operator<(const TLanguage &l, const TLanguage &r) {
 	return strcmp(l.name, r.name) < 0;
 }
 
-TranslationManager::TranslationManager() : _currentLang(-1) {
+TranslationManager::TranslationManager() : _currentLang(-1), _charmap(0) {
 	loadTranslationsInfoDat();
 
 	// Set the default language
@@ -53,6 +53,7 @@ TranslationManager::TranslationManager() : _currentLang(-1) {
 }
 
 TranslationManager::~TranslationManager() {
+	delete[] _charmap;
 }
 
 int32 TranslationManager::findMatchingLanguage(const String &lang) {
@@ -289,9 +290,14 @@ void TranslationManager::loadTranslationsInfoDat() {
 	// Get number of translations
 	int nbTranslations = in.readUint16BE();
 
-	// Skip all the block sizes
-	for (int i = 0; i < nbTranslations + 2; ++i)
-		in.readUint16BE();
+	// Get number of codepages
+	int nbCodepages = in.readUint16BE();
+
+	// Determine where the codepages start
+	_charmapStart = 0;
+	for (int i = 0; i < nbTranslations + 3; ++i)
+		_charmapStart += in.readUint16BE();
+	_charmapStart += in.pos();
 
 	// Read list of languages
 	_langs.resize(nbTranslations);
@@ -305,6 +311,14 @@ void TranslationManager::loadTranslationsInfoDat() {
 		_langNames[i] = String(buf, len - 1);
 	}
 
+	// Read list of codepages
+	_charmaps.resize(nbCodepages);
+	for (int i = 0; i < nbCodepages; ++i) {
+		len = in.readUint16BE();
+		in.read(buf, len);
+		_charmaps[i] = String(buf, len - 1);
+	}
+
 	// Read messages
 	int numMessages = in.readUint16BE();
 	_messageIds.resize(numMessages);
@@ -344,9 +358,16 @@ void TranslationManager::loadLanguageDat(int index) {
 		return;
 	}
 
+	// Get the number of codepages
+	int nbCodepages = in.readUint16BE();
+	if (nbCodepages != (int)_charmaps.size()) {
+		warning("The 'translations.dat' file has changed since starting ScummVM. GUI translation will not be available");
+		return;
+	}
+
 	// Get size of blocks to skip.
 	int skipSize = 0;
-	for (int i = 0; i < index + 2; ++i)
+	for (int i = 0; i < index + 3; ++i)
 		skipSize += in.readUint16BE();
 	// We also need to skip the remaining block sizes
 	skipSize += 2 * (nbTranslations - index);
@@ -380,6 +401,29 @@ void TranslationManager::loadLanguageDat(int index) {
 			_currentTranslationMessages[i].msgctxt = String(buf, len - 1);
 		}
 	}
+
+	// Find the charset
+	int charmapNum = -1;
+	for (uint i = 0; i < _charmaps.size(); ++i) {
+		if (_charmaps[i].equalsIgnoreCase(_currentCharset)) {
+			charmapNum = i;
+			break;
+		}
+	}
+
+	// Setup the new charset mapping
+	if (charmapNum == -1) {
+		delete[] _charmap;
+		_charmap = 0;
+	} else {
+		if (!_charmap)
+			_charmap = new uint32[256];
+
+		in.seek(_charmapStart + charmapNum * 256 * 4, SEEK_SET);
+		for (int i = 0; i < 256; ++i)
+			_charmap[i] = in.readUint32BE();
+	}
+
 }
 
 bool TranslationManager::checkHeader(File &in) {
diff --git a/common/translation.h b/common/translation.h
index 71cf2b0..77e2fdf 100644
--- a/common/translation.h
+++ b/common/translation.h
@@ -154,6 +154,21 @@ public:
 	String getCurrentCharset() const;
 
 	/**
+	 * Returns a pointer to the current charset mapping. This mapping is a
+	 * codepage encoding -> unicode mapping and always 256 entries long.
+	 *
+	 * The MSB of the individual mapped (i.e. unicode) character states
+	 * whether the character is required for this charset. If it is set, the
+	 * character needs to be present in order to have the text displayed.
+	 * This is used in the font loading code to detect whether the font is
+	 * able of supporting this language.
+	 *
+	 * The return value might be 0 in case it's a default ASCII/ISO-8859-1
+	 * map.
+	 */
+	const uint32 *getCharsetMapping() const { return _charmap; }
+
+	/**
 	 * Returns currently selected translation language
 	 */
 	String getCurrentLanguage() const;
@@ -200,11 +215,15 @@ private:
 
 	StringArray _langs;
 	StringArray _langNames;
+	StringArray _charmaps;
 
 	StringArray _messageIds;
 	Array<PoMessageEntry> _currentTranslationMessages;
 	String _currentCharset;
 	int _currentLang;
+
+	uint32 _charmapStart;
+	uint32 *_charmap;
 };
 
 } // End of namespace Common
diff --git a/devtools/create_translations/cp_parser.cpp b/devtools/create_translations/cp_parser.cpp
new file mode 100644
index 0000000..a4202bf
--- /dev/null
+++ b/devtools/create_translations/cp_parser.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.
+ *
+ * This is a utility for create the translations.dat file from all the po files.
+ * The generated files is used by ScummVM to propose translation of its GUI.
+ */
+
+#include "cp_parser.h"
+
+#include <fstream>
+#include <stdio.h>
+
+Codepage::Codepage(const std::string &name, const uint32 *mapping) : _name(name) {
+	if (!mapping) {
+		// Default to a ISO-8859-1 mapping
+		for (unsigned int i = 0; i < 256; ++i)
+			_mapping[i] = i;
+	} else {
+		for (unsigned int i = 0; i < 256; ++i)
+			_mapping[i] = *mapping++;
+	}
+}
+
+Codepage *parseCodepageMapping(const std::string &filename) {
+	size_t start = filename.find_last_of("/\\");
+	if (start == std::string::npos)
+		start = 0;
+	// Strip off the filename extension
+	const size_t pos = filename.find_last_of('.');
+	const std::string charset(filename.substr(start + 1, pos != std::string::npos ? (pos - start - 1) : std::string::npos));
+
+	std::ifstream in(filename.c_str());
+	if (!in) {
+		fprintf(stderr, "ERROR: Could not open file \"%s\"!", filename.c_str());
+		return 0;
+	}
+
+	uint32 mapping[256];
+
+	int processedMappings = 0;
+	std::string line;
+	while (processedMappings < 256) {
+		std::getline(in, line);
+		if (in.eof())
+			break;
+		if (in.fail()) {
+			fprintf(stderr, "ERROR: Reading from file \"%s\" failed!", filename.c_str());
+			return 0;
+		}
+
+		// In case the line starts with a "#" it is a comment. We also ignore
+		// empty lines.
+		if (line.empty() || line[0] == '#')
+			continue;
+
+		// Read the unicode number, we thereby ignore everything else on the line
+		int unicode, required;
+		const int parsed = sscanf(line.c_str(), "%d %d", &unicode, &required);
+		if (parsed < 1 || parsed > 2) {
+			fprintf(stderr, "ERROR: Line \"%s\" is malformed!", filename.c_str());
+			return 0;
+		}
+		// In case no required integer was given, we assume the character is
+		// required
+		if (parsed == 1)
+			required = 1;
+
+		// -1 means default mapping
+		if (unicode == -1)
+			unicode = processedMappings;
+
+		uint32 unicodeValue = unicode;
+		if (required)
+			unicodeValue |= 0x80000000;
+
+		mapping[processedMappings++] = (uint32)unicodeValue;
+	}
+
+	// Check whether all character encodings are mapped, if not error out
+	if (processedMappings != 256) {
+		fprintf(stderr, "ERROR: File \"%s\" does not contain mappings for exactly 256 characters!", filename.c_str());
+		return 0;
+	}
+
+	// Return the codepage
+	return new Codepage(charset, mapping);
+}
diff --git a/devtools/create_translations/cp_parser.h b/devtools/create_translations/cp_parser.h
new file mode 100644
index 0000000..b748430
--- /dev/null
+++ b/devtools/create_translations/cp_parser.h
@@ -0,0 +1,54 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * This is a utility for create the translations.dat file from all the po files.
+ * The generated files is used by ScummVM to propose translation of its GUI.
+ */
+
+#ifndef CP_PARSER_H
+#define CP_PARSER_H
+
+#include "create_translations.h"
+
+#include <string>
+
+/**
+ * Codepage description.
+ *
+ * This includes a name, and the codepage -> unicode mapping.
+ */
+class Codepage {
+public:
+	Codepage(const std::string &name, const uint32 *mapping);
+
+	const std::string &getName() const { return _name; }
+
+	uint32 getMapping(unsigned char src) const { return _mapping[src]; }
+private:
+	std::string _name;
+	uint32 _mapping[256];
+};
+
+/**
+ * Parse the codepage file and create a codepage.
+ */
+Codepage *parseCodepageMapping(const std::string &filename);
+
+#endif
diff --git a/devtools/create_translations/create_translations.cpp b/devtools/create_translations/create_translations.cpp
index 9fcf3b4..a153632 100644
--- a/devtools/create_translations/create_translations.cpp
+++ b/devtools/create_translations/create_translations.cpp
@@ -25,6 +25,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
+#include <vector>
 
  // HACK to allow building with the SDL backend on MinGW
 // see bug #1800764 "TOOLS: MinGW tools building broken"
@@ -34,8 +36,23 @@
 
 #include "create_translations.h"
 #include "po_parser.h"
+#include "cp_parser.h"
 
-#define TRANSLATIONS_DAT_VER 2	// 1 byte
+#define TRANSLATIONS_DAT_VER 3	// 1 byte
+
+// Portable implementation of stricmp / strcasecmp / strcmpi.
+int scumm_stricmp(const char *s1, const char *s2) {
+	uint8 l1, l2;
+	do {
+		// Don't use ++ inside tolower, in case the macro uses its
+		// arguments more than once.
+		l1 = (uint8)*s1++;
+		l1 = tolower(l1);
+		l2 = (uint8)*s2++;
+		l2 = tolower(l2);
+	} while (l1 == l2 && l1 != 0);
+	return l1 - l2;
+}
 
 // Padding buffer (filled with 0) used if we want to aligned writes
 // static uint8 padBuf[DATAALIGNMENT];
@@ -52,6 +69,13 @@ void writeUint16BE(FILE *fp, uint16 value) {
 	writeByte(fp, (uint8)(value & 0xFF));
 }
 
+void writeUint32BE(FILE *fp, uint32 value) {
+	writeByte(fp, (uint8)(value >> 24));
+	writeByte(fp, (uint8)(value >> 16));
+	writeByte(fp, (uint8)(value >>  8));
+	writeByte(fp, (uint8)(value & 0xFF));
+}
+
 int stringSize(const char *string) {
 	// Each string is preceded by its size coded on 2 bytes
 	if (string == NULL)
@@ -82,14 +106,51 @@ void writeString(FILE *fp, const char *string) {
 
 // Main
 int main(int argc, char *argv[]) {
-	// Build the translation list
+	std::vector<Codepage *> codepages;
+	// Add default codepages, we won't store them in the output later on
+	codepages.push_back(new Codepage("ascii", 0));
+	codepages.push_back(new Codepage("iso-8859-1", 0));
+
+	// Build the translation and codepage list
 	PoMessageList messageIds;
-	PoMessageEntryList **translations = new PoMessageEntryList*[argc - 1];
+	std::vector<PoMessageEntryList *> translations;
 	int numLangs = 0;
 	for (int i = 1; i < argc; ++i) {
-		translations[numLangs] = parsePoFile(argv[i], messageIds);
-		if (translations[numLangs] != NULL)
-			++numLangs;
+		// Check file extension
+		int len = strlen(argv[i]);
+		if (scumm_stricmp(argv[i] + len - 2, "po") == 0) {
+			PoMessageEntryList *po = parsePoFile(argv[i], messageIds);
+			if (po != NULL) {
+				translations.push_back(po);
+				++numLangs;
+			}
+		} else if (scumm_stricmp(argv[i] + len - 2, "cp") == 0) {
+			// Else try to parse an codepage
+			Codepage *co = parseCodepageMapping(argv[i]);
+			if (co)
+				codepages.push_back(co);
+		}
+	}
+
+	// Parse all charset mappings
+	for (int i = 0; i < numLangs; ++i) {
+		bool found = false;
+		for (size_t j = 0; j < codepages.size(); ++j) {
+			if (scumm_stricmp(codepages[j]->getName().c_str(), translations[i]->charset()) == 0) {
+				found = true;
+				break;
+			}
+		}
+
+		// In case the codepage was not found error out
+		if (!found) {
+			fprintf(stderr, "ERROR: No codepage mapping for codepage \"%s\" present!\n", translations[i]->charset());
+			for (size_t j = 0; j < translations.size(); ++j)
+				delete translations[j];
+			for (size_t j = 0; j < codepages.size(); ++j)
+				delete codepages[j];
+			return -1;
+		}
 	}
 
 	FILE *outFile;
@@ -110,6 +171,8 @@ int main(int argc, char *argv[]) {
 
 	// Write number of translations
 	writeUint16BE(outFile, numLangs);
+	// Write number of codepages, we don't save ascii and iso-8859-1
+	writeUint16BE(outFile, codepages.size() - 2);
 
 	// Write the length of each data block here.
 	// We could write it at the start of each block but that would mean that
@@ -119,9 +182,14 @@ int main(int argc, char *argv[]) {
 	// file and can then skip to the block we want.
 	// Blocks are:
 	//   1. List of languages with the language name
-	//   2. Original messages (i.e. english)
-	//   3. First translation
-	//   4. Second translation
+	//   2. List of codepages
+	//   3. Original messages (i.e. english)
+	//   4. First translation
+	//   5. Second translation
+	//   ...
+	//   n. First codepage (These don't have any data size, since they are all
+	//                      256 * 4 bytes long)
+	//   n+1. Second codepage
 	//   ...
 
 	// Write length for translation description
@@ -132,6 +200,12 @@ int main(int argc, char *argv[]) {
 	}
 	writeUint16BE(outFile, len);
 
+	// Write length for the codepage names
+	len = 0;
+	for (size_t j = 2; j < codepages.size(); ++j)
+		len += stringSize(codepages[j]->getName().c_str());
+	writeUint16BE(outFile, len);
+
 	// Write size for the original language (english) block
 	// It starts with the number of strings coded on 2 bytes followed by each
 	// string (two bytes for the number of chars and the string itself).
@@ -159,6 +233,11 @@ int main(int argc, char *argv[]) {
 		writeString(outFile, translations[lang]->languageName());
 	}
 
+	// Write list of codepages
+	for (size_t j = 2; j < codepages.size(); ++j) {
+		writeString(outFile, codepages[j]->getName().c_str());
+	}
+
 	// Write original messages
 	writeUint16BE(outFile, messageIds.size());
 	for (i = 0; i < messageIds.size(); ++i) {
@@ -176,12 +255,18 @@ int main(int argc, char *argv[]) {
 		}
 	}
 
+	// Write codepages
+	for (size_t j = 2; j < codepages.size(); ++j) {
+		const Codepage *cp = codepages[j];
+		for (i = 0; i < 256; ++i)
+			writeUint32BE(outFile, cp->getMapping(i));
+	}
+
 	fclose(outFile);
 
 	// Clean the memory
 	for (i = 0; i < numLangs; ++i)
 		delete translations[i];
-	delete[] translations;
 
 	return 0;
 }
diff --git a/devtools/create_translations/create_translations.h b/devtools/create_translations/create_translations.h
index 0ece810..9ccbd39 100644
--- a/devtools/create_translations/create_translations.h
+++ b/devtools/create_translations/create_translations.h
@@ -25,6 +25,7 @@
 
 typedef unsigned char   uint8;
 typedef unsigned short uint16;
+typedef unsigned int   uint32;
 typedef signed short int16;
 
 #endif /* CREATE_TRANSLATIONS_H */
diff --git a/devtools/create_translations/module.mk b/devtools/create_translations/module.mk
index 430cf91..9a2b302 100644
--- a/devtools/create_translations/module.mk
+++ b/devtools/create_translations/module.mk
@@ -1,6 +1,7 @@
 MODULE := devtools/create_translations
 
 MODULE_OBJS := \
+	cp_parser.o \
 	po_parser.o \
 	create_translations.o
 
diff --git a/graphics/fonts/ttf.cpp b/graphics/fonts/ttf.cpp
index b5bf5c0..2ba6205 100644
--- a/graphics/fonts/ttf.cpp
+++ b/graphics/fonts/ttf.cpp
@@ -101,7 +101,7 @@ public:
 	TTFFont();
 	virtual ~TTFFont();
 
-	bool load(Common::SeekableReadStream &stream, int size, bool monochrome);
+	bool load(Common::SeekableReadStream &stream, int size, bool monochrome, const uint32 *mapping);
 
 	virtual int getFontHeight() const;
 
@@ -157,7 +157,7 @@ TTFFont::~TTFFont() {
 	}
 }
 
-bool TTFFont::load(Common::SeekableReadStream &stream, int size, bool monochrome) {
+bool TTFFont::load(Common::SeekableReadStream &stream, int size, bool monochrome, const uint32 *mapping) {
 	if (!g_ttf.isInitialized())
 		return false;
 
@@ -211,10 +211,24 @@ bool TTFFont::load(Common::SeekableReadStream &stream, int size, bool monochrome
 	_width = ftCeil26_6(FT_MulFix(_face->max_advance_width, _face->size->metrics.x_scale));
 	_height = _ascent - _descent + 1;
 
-	// Load all ISO-8859-1 characters.
-	for (uint i = 0; i < 256; ++i) {
-		if (!cacheGlyph(_glyphs[i], _glyphSlots[i], i))
-			_glyphSlots[i] = 0;
+	if (!mapping) {
+		// Load all ISO-8859-1 characters.
+		for (uint i = 0; i < 256; ++i) {
+			if (!cacheGlyph(_glyphs[i], _glyphSlots[i], i))
+				_glyphSlots[i] = 0;
+		}
+	} else {
+		for (uint i = 0; i < 256; ++i) {
+			const uint32 unicode = mapping[i] & 0x7FFFFFFF;
+			const bool isRequired = (mapping[i] & 0x80000000) != 0;
+			// Check whether loading an important glyph fails and error out if
+			// that is the case.
+			if (!cacheGlyph(_glyphs[i], _glyphSlots[i], unicode)) {
+				_glyphSlots[i] = 0;
+				if (isRequired)
+					return false;
+			}
+		}
 	}
 
 	_initialized = (_glyphs.size() != 0);
@@ -447,10 +461,10 @@ bool TTFFont::cacheGlyph(Glyph &glyph, FT_UInt &slot, uint chr) {
 	return true;
 }
 
-Font *loadTTFFont(Common::SeekableReadStream &stream, int size, bool monochrome) {
+Font *loadTTFFont(Common::SeekableReadStream &stream, int size, bool monochrome, const uint32 *mapping) {
 	TTFFont *font = new TTFFont();
 
-	if (!font->load(stream, size, monochrome)) {
+	if (!font->load(stream, size, monochrome, mapping)) {
 		delete font;
 		return 0;
 	}
diff --git a/graphics/fonts/ttf.h b/graphics/fonts/ttf.h
index f534988..7222d6e 100644
--- a/graphics/fonts/ttf.h
+++ b/graphics/fonts/ttf.h
@@ -32,7 +32,7 @@
 namespace Graphics {
 
 class Font;
-Font *loadTTFFont(Common::SeekableReadStream &stream, int size, bool monochrome = false);
+Font *loadTTFFont(Common::SeekableReadStream &stream, int size, bool monochrome = false, const uint32 *mapping = 0);
 
 } // End of namespace Graphics
 
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 46a0eda..3cfa555 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -1399,12 +1399,6 @@ DrawData ThemeEngine::parseDrawDataId(const Common::String &name) const {
 
 const Graphics::Font *ThemeEngine::loadScalableFont(const Common::String &filename, const Common::String &charset, const int pointsize, Common::String &name) {
 #ifdef USE_FREETYPE2
-	// We only support ISO-8859-1 for TTF right now.
-	if (!charset.empty()
-	    && !charset.equalsIgnoreCase("iso-8859-1")
-	    && !charset.equalsIgnoreCase("ascii"))
-		return 0;
-
 	name = Common::String::format("%s-%s@%d", filename.c_str(), charset.c_str(), pointsize);
 
 	// Try already loaded fonts.
@@ -1418,7 +1412,7 @@ const Graphics::Font *ThemeEngine::loadScalableFont(const Common::String &filena
 	for (Common::ArchiveMemberList::const_iterator i = members.begin(), end = members.end(); i != end; ++i) {
 		Common::SeekableReadStream *stream = (*i)->createReadStream();
 		if (stream) {
-			font = Graphics::loadTTFFont(*stream, pointsize, false);
+			font = Graphics::loadTTFFont(*stream, pointsize, false, TransMan.getCharsetMapping());
 			delete stream;
 
 			if (font)
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 447b7b9..4fab3f6 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 0b06dc6..446ac42 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.3.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2011-12-26 15:26+0100\n"
+"POT-Creation-Date: 2012-01-28 21:48+0100\n"
 "PO-Revision-Date: 2011-10-04 20:51+0100\n"
 "Last-Translator: Jordi Vilalta Prat <jvprat at jvprat.com>\n"
 "Language-Team: Catalan <scummvm-devel at lists.sf.net>\n"
@@ -45,7 +45,7 @@ msgstr "Amunt"
 #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
 #: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221
 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
-#: engines/engine.cpp:436 engines/scumm/dialogs.cpp:190
+#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190
 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
 #: backends/platform/wii/options.cpp:48
 #: backends/events/default/default-events.cpp:222
@@ -57,22 +57,22 @@ msgstr "Cancel
 msgid "Choose"
 msgstr "Escull"
 
-#: gui/gui-manager.cpp:116 engines/scumm/help.cpp:125
+#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125
 #: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165
 #: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209
 #: backends/keymapper/remap-dialog.cpp:52
 msgid "Close"
 msgstr "Tanca"
 
-#: gui/gui-manager.cpp:119
+#: gui/gui-manager.cpp:118
 msgid "Mouse click"
 msgstr "Clic del ratolí"
 
-#: gui/gui-manager.cpp:122 base/main.cpp:283
+#: gui/gui-manager.cpp:121 base/main.cpp:289
 msgid "Display keyboard"
 msgstr "Mostra el teclat"
 
-#: gui/gui-manager.cpp:125 base/main.cpp:286
+#: gui/gui-manager.cpp:124 base/main.cpp:292
 msgid "Remap keys"
 msgstr "Assigna les tecles"
 
@@ -86,11 +86,11 @@ msgstr "Assigna"
 
 #: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959
 #: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222
-#: engines/engine.cpp:359 engines/engine.cpp:370 engines/scumm/dialogs.cpp:192
+#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
 #: engines/scumm/scumm.cpp:1784 engines/agos/animation.cpp:551
 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
-#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:345
-#: engines/sword1/animation.cpp:355 engines/sword1/animation.cpp:361
+#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449
+#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465
 #: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633
 #: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389
 #: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281
@@ -346,7 +346,7 @@ msgstr ""
 msgid "~Q~uit"
 msgstr "~T~anca"
 
-#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:80
+#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96
 msgid "Quit ScummVM"
 msgstr "Surt de ScummVM"
 
@@ -354,7 +354,7 @@ msgstr "Surt de ScummVM"
 msgid "A~b~out..."
 msgstr "~Q~uant a..."
 
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:61
+#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70
 msgid "About ScummVM"
 msgstr "Quant a ScummVM"
 
@@ -968,28 +968,28 @@ msgstr "Partida sense t
 msgid "Select a Theme"
 msgstr "Seleccioneu un Tema"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgid "Disabled GFX"
 msgstr "GFX desactivats"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgctxt "lowres"
 msgid "Disabled GFX"
 msgstr "GFX desactivats"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard Renderer (16bpp)"
 msgstr "Pintat estàndard (16bpp)"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard (16bpp)"
 msgstr "Estàndard (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased Renderer (16bpp)"
 msgstr "Pintat amb antialias (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased (16bpp)"
 msgstr "Amb antialias (16bpp)"
 
@@ -1002,30 +1002,30 @@ msgstr "Neteja el valor"
 msgid "Engine does not support debug level '%s'"
 msgstr "El motor no suporta el nivell de depuració '%s'"
 
-#: base/main.cpp:271
+#: base/main.cpp:277
 msgid "Menu"
 msgstr "Menú"
 
-#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:280 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:277 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50
 #: backends/platform/wince/CEActionsPocket.cpp:42
 msgid "Pause"
 msgstr "Pausa"
 
-#: base/main.cpp:280
+#: base/main.cpp:286
 msgid "Skip line"
 msgstr "Salta la línia"
 
-#: base/main.cpp:439
+#: base/main.cpp:445
 msgid "Error running game:"
 msgstr "Error al executar el joc:"
 
-#: base/main.cpp:463
+#: base/main.cpp:469
 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"
 
@@ -1197,23 +1197,23 @@ msgstr "~C~ancel
 msgid "~K~eys"
 msgstr "~T~ecles"
 
-#: engines/engine.cpp:233
+#: engines/engine.cpp:235
 msgid "Could not initialize color format."
 msgstr "No s'ha pogut iniciar el format de color."
 
-#: engines/engine.cpp:241
+#: engines/engine.cpp:243
 msgid "Could not switch to video mode: '"
 msgstr "No s'ha pogut canviar al mode de vídeo: '"
 
-#: engines/engine.cpp:250
+#: engines/engine.cpp:252
 msgid "Could not apply aspect ratio setting."
 msgstr "No s'ha pogut aplicar la configuració de la relació d'aspecte."
 
-#: engines/engine.cpp:255
+#: engines/engine.cpp:257
 msgid "Could not apply fullscreen setting."
 msgstr "No s'ha pogut aplicar l'ajust de pantalla completa."
 
-#: engines/engine.cpp:355
+#: engines/engine.cpp:357
 msgid ""
 "You appear to be playing this game directly\n"
 "from the CD. This is known to cause problems,\n"
@@ -1227,7 +1227,7 @@ msgstr ""
 "els fitxers de dades al disc dur.\n"
 "Consulteu el fitxer README per a més detalls."
 
-#: engines/engine.cpp:366
+#: engines/engine.cpp:368
 msgid ""
 "This game has audio tracks in its disk. These\n"
 "tracks need to be ripped from the disk using\n"
@@ -1241,7 +1241,7 @@ msgstr ""
 "tal de poder sentir la música del joc.\n"
 "Consulteu el fitxer README per a més detalls."
 
-#: engines/engine.cpp:433
+#: engines/engine.cpp:435
 msgid ""
 "WARNING: The game you are about to start is not yet fully supported by "
 "ScummVM. As such, it is likely to be unstable, and any saves you make might "
@@ -1251,7 +1251,7 @@ msgstr ""
 "pel ScummVM. Com a tal, probablement serà inestable, i pot ser que les "
 "partides que deseu no funcionin en versions futures de ScummVM."
 
-#: engines/engine.cpp:436
+#: engines/engine.cpp:438
 msgid "Start anyway"
 msgstr "Inicia de totes maneres"
 
@@ -2011,56 +2011,56 @@ msgstr "No s'ha pogut esborrar el fitxer."
 msgid "Failed to save game"
 msgstr "No s'ha pogut desar l'estat del joc"
 
-#: engines/kyra/lol.cpp:572
+#: engines/kyra/lol.cpp:478
 msgid "Attack 1"
 msgstr ""
 
-#: engines/kyra/lol.cpp:573
+#: engines/kyra/lol.cpp:479
 msgid "Attack 2"
 msgstr ""
 
-#: engines/kyra/lol.cpp:574
+#: engines/kyra/lol.cpp:480
 msgid "Attack 3"
 msgstr ""
 
-#: engines/kyra/lol.cpp:575
+#: engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr ""
 
-#: engines/kyra/lol.cpp:576
+#: engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr ""
 
-#: engines/kyra/lol.cpp:577
+#: engines/kyra/lol.cpp:483
 msgid "Slide Left"
 msgstr ""
 
-#: engines/kyra/lol.cpp:578
+#: engines/kyra/lol.cpp:484
 #, fuzzy
 msgid "Slide Right"
 msgstr "Dreta"
 
-#: engines/kyra/lol.cpp:579
+#: engines/kyra/lol.cpp:485
 #, fuzzy
 msgid "Turn Left"
 msgstr "Apaga"
 
-#: engines/kyra/lol.cpp:580
+#: engines/kyra/lol.cpp:486
 #, fuzzy
 msgid "Turn Right"
 msgstr "Cursor Dreta"
 
-#: engines/kyra/lol.cpp:581
+#: engines/kyra/lol.cpp:487
 #, fuzzy
 msgid "Rest"
 msgstr "Restaura"
 
-#: engines/kyra/lol.cpp:582
+#: engines/kyra/lol.cpp:488
 #, fuzzy
 msgid "Options"
 msgstr "~O~pcions"
 
-#: engines/kyra/lol.cpp:583
+#: engines/kyra/lol.cpp:489
 #, fuzzy
 msgid "Choose Spell"
 msgstr "Escull"
@@ -2095,17 +2095,17 @@ msgstr ""
 "El fitxer \"sky.cpt\" té una mida incorrecta.\n"
 "Torneu a baixar-lo de www.scummvm.org"
 
-#: engines/sword1/animation.cpp:345 engines/sword2/animation.cpp:379
+#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379
 msgid "DXA cutscenes found but ScummVM has been built without zlib support"
 msgstr ""
 "S'han trobat escenes en DXA, però s'ha compilat el ScummVM sense suport de "
 "zlib"
 
-#: engines/sword1/animation.cpp:355 engines/sword2/animation.cpp:389
+#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389
 msgid "MPEG2 cutscenes are no longer supported"
 msgstr "Les escenes MPEG2 ja no estan suportades"
 
-#: engines/sword1/animation.cpp:360 engines/sword2/animation.cpp:397
+#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397
 #, c-format
 msgid "Cutscene '%s' not found"
 msgstr "No s'ha trobat l'escena '%s'"
@@ -2392,24 +2392,24 @@ msgstr "Mode Touchpad activat."
 msgid "Touchpad mode disabled."
 msgstr "Mode Touchpad desactivat."
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:67
+#: backends/platform/sdl/macosx/appmenu_osx.mm:78
 msgid "Hide ScummVM"
 msgstr "Amaga ScummVM"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: backends/platform/sdl/macosx/appmenu_osx.mm:83
 msgid "Hide Others"
 msgstr "Oculta els altres"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:74
+#: backends/platform/sdl/macosx/appmenu_osx.mm:88
 msgid "Show All"
 msgstr "Mostra-ho tot"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:92
-#: backends/platform/sdl/macosx/appmenu_osx.mm:99
+#: backends/platform/sdl/macosx/appmenu_osx.mm:110
+#: backends/platform/sdl/macosx/appmenu_osx.mm:121
 msgid "Window"
 msgstr "Finestra"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:95
+#: backends/platform/sdl/macosx/appmenu_osx.mm:115
 msgid "Minimize"
 msgstr "Minimitza"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index adea444..ac91c69 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.4.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2011-12-26 15:26+0100\n"
+"POT-Creation-Date: 2012-01-28 21:48+0100\n"
 "PO-Revision-Date: 2011-12-27 17:46+0100\n"
 "Last-Translator: Zbynìk Schwarz <zbynek.schwarz at gmail.com>\n"
 "Language-Team: \n"
+"Language: Cesky\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: Cesky\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 "X-Poedit-Language: Czech\n"
 "X-Poedit-Country: CZECH REPUBLIC\n"
@@ -49,7 +49,7 @@ msgstr "J
 #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
 #: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221
 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
-#: engines/engine.cpp:436 engines/scumm/dialogs.cpp:190
+#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190
 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
 #: backends/platform/wii/options.cpp:48
 #: backends/events/default/default-events.cpp:222
@@ -61,22 +61,22 @@ msgstr "Zru
 msgid "Choose"
 msgstr "Zvolit"
 
-#: gui/gui-manager.cpp:116 engines/scumm/help.cpp:125
+#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125
 #: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165
 #: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209
 #: backends/keymapper/remap-dialog.cpp:52
 msgid "Close"
 msgstr "Zavøít"
 
-#: gui/gui-manager.cpp:119
+#: gui/gui-manager.cpp:118
 msgid "Mouse click"
 msgstr "Kliknutí my¹í"
 
-#: gui/gui-manager.cpp:122 base/main.cpp:283
+#: gui/gui-manager.cpp:121 base/main.cpp:289
 msgid "Display keyboard"
 msgstr "Zobrazit klávesnici"
 
-#: gui/gui-manager.cpp:125 base/main.cpp:286
+#: gui/gui-manager.cpp:124 base/main.cpp:292
 msgid "Remap keys"
 msgstr "Pøemapovat klávesy"
 
@@ -90,11 +90,11 @@ msgstr "Mapovat"
 
 #: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959
 #: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222
-#: engines/engine.cpp:359 engines/engine.cpp:370 engines/scumm/dialogs.cpp:192
+#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
 #: engines/scumm/scumm.cpp:1784 engines/agos/animation.cpp:551
 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
-#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:345
-#: engines/sword1/animation.cpp:355 engines/sword1/animation.cpp:361
+#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449
+#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465
 #: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633
 #: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389
 #: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281
@@ -347,7 +347,7 @@ msgstr "Toto ID hry je u
 msgid "~Q~uit"
 msgstr "~U~konèit"
 
-#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:80
+#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96
 msgid "Quit ScummVM"
 msgstr "Ukonèit ScummVM"
 
@@ -355,7 +355,7 @@ msgstr "Ukon
 msgid "A~b~out..."
 msgstr "~O~ Programu..."
 
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:61
+#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70
 msgid "About ScummVM"
 msgstr "O ScummVM"
 
@@ -958,28 +958,28 @@ msgstr "Bezejmenn
 msgid "Select a Theme"
 msgstr "Vyberte Vzhled"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgid "Disabled GFX"
 msgstr "GFX zakázáno"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgctxt "lowres"
 msgid "Disabled GFX"
 msgstr "GFX zakázáno"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard Renderer (16bpp)"
 msgstr "Standardní Vykreslovaè (16bpp)"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard (16bpp)"
 msgstr "Standardní (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased Renderer (16bpp)"
 msgstr "Vykreslovaè s vyhlazenými hranami (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased (16bpp)"
 msgstr "S vyhlazenými hranami (16bpp)"
 
@@ -992,30 +992,30 @@ msgstr "Vy
 msgid "Engine does not support debug level '%s'"
 msgstr "Jádro nepodporuje úroveò ladìní '%s'"
 
-#: base/main.cpp:271
+#: base/main.cpp:277
 msgid "Menu"
 msgstr "Menu"
 
-#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:280 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:277 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50
 #: backends/platform/wince/CEActionsPocket.cpp:42
 msgid "Pause"
 msgstr "Pauza"
 
-#: base/main.cpp:280
+#: base/main.cpp:286
 msgid "Skip line"
 msgstr "Pøeskoèit øádek"
 
-#: base/main.cpp:439
+#: base/main.cpp:445
 msgid "Error running game:"
 msgstr "Chyba pøi spu¹tìní hry:"
 
-#: base/main.cpp:463
+#: base/main.cpp:469
 msgid "Could not find any engine capable of running the selected game"
 msgstr "Nelze nalézt ¾ádné jádro schopné vybranou hru spustit"
 
@@ -1187,23 +1187,23 @@ msgstr "~Z~ru
 msgid "~K~eys"
 msgstr "~K~lávesy"
 
-#: engines/engine.cpp:233
+#: engines/engine.cpp:235
 msgid "Could not initialize color format."
 msgstr "Nelze zavést barevný formát."
 
-#: engines/engine.cpp:241
+#: engines/engine.cpp:243
 msgid "Could not switch to video mode: '"
 msgstr "Nelze pøepnout na re¾im obrazu: '"
 
-#: engines/engine.cpp:250
+#: engines/engine.cpp:252
 msgid "Could not apply aspect ratio setting."
 msgstr "Nelze pou¾ít nastavení pomìru stran."
 
-#: engines/engine.cpp:255
+#: engines/engine.cpp:257
 msgid "Could not apply fullscreen setting."
 msgstr "Nelze pou¾ít nastavení celé obrazovky."
 
-#: engines/engine.cpp:355
+#: engines/engine.cpp:357
 msgid ""
 "You appear to be playing this game directly\n"
 "from the CD. This is known to cause problems,\n"
@@ -1217,7 +1217,7 @@ msgstr ""
 "datové soubory na Vá¹ pevný disk.\n"
 "Pro podrobnosti si pøeètìte README."
 
-#: engines/engine.cpp:366
+#: engines/engine.cpp:368
 msgid ""
 "This game has audio tracks in its disk. These\n"
 "tracks need to be ripped from the disk using\n"
@@ -1231,7 +1231,7 @@ msgstr ""
 "abyste mohli poslouchat hudbu ve høe.\n"
 "Pro podrobnosti si pøeètìte README."
 
-#: engines/engine.cpp:433
+#: engines/engine.cpp:435
 msgid ""
 "WARNING: The game you are about to start is not yet fully supported by "
 "ScummVM. As such, it is likely to be unstable, and any saves you make might "
@@ -1241,7 +1241,7 @@ msgstr ""
 "ScummVM. Proto je mo¾né, ¾e bude nestabilní a jakékoli ulo¾ené hry nemusí "
 "fungovat v budoucích verzích ScummVM."
 
-#: engines/engine.cpp:436
+#: engines/engine.cpp:438
 msgid "Start anyway"
 msgstr "Pøesto spustit"
 
@@ -2000,51 +2000,51 @@ msgstr "Nelze smazat soubor."
 msgid "Failed to save game"
 msgstr "Nelze ulo¾it hru."
 
-#: engines/kyra/lol.cpp:572
+#: engines/kyra/lol.cpp:478
 msgid "Attack 1"
 msgstr "Útok 1"
 
-#: engines/kyra/lol.cpp:573
+#: engines/kyra/lol.cpp:479
 msgid "Attack 2"
 msgstr "Útok 2"
 
-#: engines/kyra/lol.cpp:574
+#: engines/kyra/lol.cpp:480
 msgid "Attack 3"
 msgstr "Útok 3"
 
-#: engines/kyra/lol.cpp:575
+#: engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Vpøed"
 
-#: engines/kyra/lol.cpp:576
+#: engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Vzad"
 
-#: engines/kyra/lol.cpp:577
+#: engines/kyra/lol.cpp:483
 msgid "Slide Left"
 msgstr "Pøesunout se Doleva"
 
-#: engines/kyra/lol.cpp:578
+#: engines/kyra/lol.cpp:484
 msgid "Slide Right"
 msgstr "Pøesunout se Doprava"
 
-#: engines/kyra/lol.cpp:579
+#: engines/kyra/lol.cpp:485
 msgid "Turn Left"
 msgstr "Otoèit se doleva"
 
-#: engines/kyra/lol.cpp:580
+#: engines/kyra/lol.cpp:486
 msgid "Turn Right"
 msgstr "Otoèit se doprava"
 
-#: engines/kyra/lol.cpp:581
+#: engines/kyra/lol.cpp:487
 msgid "Rest"
 msgstr "Odpoèinout si"
 
-#: engines/kyra/lol.cpp:582
+#: engines/kyra/lol.cpp:488
 msgid "Options"
 msgstr "Volby"
 
-#: engines/kyra/lol.cpp:583
+#: engines/kyra/lol.cpp:489
 msgid "Choose Spell"
 msgstr "Zvolit Kouzlo"
 
@@ -2078,15 +2078,15 @@ msgstr ""
 "Soubor \"sky.cpt\" má nesprávnou velikost.\n"
 "Stáhnìte si ho, prosím, (znovu) z www.scummvm.org"
 
-#: engines/sword1/animation.cpp:345 engines/sword2/animation.cpp:379
+#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379
 msgid "DXA cutscenes found but ScummVM has been built without zlib support"
 msgstr "Videa DXA nalezena, ale ScummVM byl sestaven bez podpory zlib"
 
-#: engines/sword1/animation.cpp:355 engines/sword2/animation.cpp:389
+#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389
 msgid "MPEG2 cutscenes are no longer supported"
 msgstr "Videa MPGE2 ji¾ nejsou podporována"
 
-#: engines/sword1/animation.cpp:360 engines/sword2/animation.cpp:397
+#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397
 #, c-format
 msgid "Cutscene '%s' not found"
 msgstr "Video '%s' nenalezeno"
@@ -2372,24 +2372,24 @@ msgstr "Touchpad re
 msgid "Touchpad mode disabled."
 msgstr "Touchpad re¾im vypnut"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:67
+#: backends/platform/sdl/macosx/appmenu_osx.mm:78
 msgid "Hide ScummVM"
 msgstr "Skrýt ScummVM"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: backends/platform/sdl/macosx/appmenu_osx.mm:83
 msgid "Hide Others"
 msgstr "Skrýt Ostatní"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:74
+#: backends/platform/sdl/macosx/appmenu_osx.mm:88
 msgid "Show All"
 msgstr "Zobrazit V¹e"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:92
-#: backends/platform/sdl/macosx/appmenu_osx.mm:99
+#: backends/platform/sdl/macosx/appmenu_osx.mm:110
+#: backends/platform/sdl/macosx/appmenu_osx.mm:121
 msgid "Window"
 msgstr "Okno"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:95
+#: backends/platform/sdl/macosx/appmenu_osx.mm:115
 msgid "Minimize"
 msgstr "Minimalizovat"
 
diff --git a/po/da_DA.po b/po/da_DA.po
index 0147186..c1f2aae 100644
--- a/po/da_DA.po
+++ b/po/da_DA.po
@@ -1,12 +1,12 @@
 # Copyright (C) 2010-2012 ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Steffen Nyeland <steffen at nyeland.dk>, 2010.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.3.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2011-12-26 15:26+0100\n"
+"POT-Creation-Date: 2012-01-28 21:48+0100\n"
 "PO-Revision-Date: 2011-01-08 22:53+0100\n"
 "Last-Translator: Steffen Nyeland <steffen at nyeland.dk>\n"
 "Language-Team: Steffen Nyeland <steffen at nyeland.dk>\n"
@@ -45,7 +45,7 @@ msgstr "G
 #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
 #: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221
 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
-#: engines/engine.cpp:436 engines/scumm/dialogs.cpp:190
+#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190
 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
 #: backends/platform/wii/options.cpp:48
 #: backends/events/default/default-events.cpp:222
@@ -57,22 +57,22 @@ msgstr "Fortryd"
 msgid "Choose"
 msgstr "Vælg"
 
-#: gui/gui-manager.cpp:116 engines/scumm/help.cpp:125
+#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125
 #: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165
 #: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209
 #: backends/keymapper/remap-dialog.cpp:52
 msgid "Close"
 msgstr "Luk"
 
-#: gui/gui-manager.cpp:119
+#: gui/gui-manager.cpp:118
 msgid "Mouse click"
 msgstr "Muse klik"
 
-#: gui/gui-manager.cpp:122 base/main.cpp:283
+#: gui/gui-manager.cpp:121 base/main.cpp:289
 msgid "Display keyboard"
 msgstr "Vis tastatur"
 
-#: gui/gui-manager.cpp:125 base/main.cpp:286
+#: gui/gui-manager.cpp:124 base/main.cpp:292
 msgid "Remap keys"
 msgstr "Kortlæg taster"
 
@@ -86,11 +86,11 @@ msgstr "Kortl
 
 #: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959
 #: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222
-#: engines/engine.cpp:359 engines/engine.cpp:370 engines/scumm/dialogs.cpp:192
+#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
 #: engines/scumm/scumm.cpp:1784 engines/agos/animation.cpp:551
 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
-#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:345
-#: engines/sword1/animation.cpp:355 engines/sword1/animation.cpp:361
+#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449
+#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465
 #: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633
 #: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389
 #: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281
@@ -345,7 +345,7 @@ msgstr "Dette spil ID er allerede i brug. V
 msgid "~Q~uit"
 msgstr "~A~fslut"
 
-#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:80
+#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96
 msgid "Quit ScummVM"
 msgstr "Afslut ScummVM"
 
@@ -353,7 +353,7 @@ msgstr "Afslut ScummVM"
 msgid "A~b~out..."
 msgstr "~O~m..."
 
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:61
+#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70
 msgid "About ScummVM"
 msgstr "Om ScummVM"
 
@@ -956,28 +956,28 @@ msgstr "Unavngivet gemmetilstand"
 msgid "Select a Theme"
 msgstr "Vælg et tema"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgid "Disabled GFX"
 msgstr "Deaktiveret GFX"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgctxt "lowres"
 msgid "Disabled GFX"
 msgstr "Deaktiveret GFX"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard Renderer (16bpp)"
 msgstr "Standard renderer (16bpp)"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard (16bpp)"
 msgstr "Standard (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased Renderer (16bpp)"
 msgstr "Antialias renderer (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased (16bpp)"
 msgstr "Antialias (16bpp)"
 
@@ -990,30 +990,30 @@ msgstr "Slet v
 msgid "Engine does not support debug level '%s'"
 msgstr "Motor understøtter ikke fejlfindingsniveau '%s'"
 
-#: base/main.cpp:271
+#: base/main.cpp:277
 msgid "Menu"
 msgstr "Menu"
 
-#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:280 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:277 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50
 #: backends/platform/wince/CEActionsPocket.cpp:42
 msgid "Pause"
 msgstr "Pause"
 
-#: base/main.cpp:280
+#: base/main.cpp:286
 msgid "Skip line"
 msgstr "Spring linje over"
 
-#: base/main.cpp:439
+#: base/main.cpp:445
 msgid "Error running game:"
 msgstr "Fejl ved kørsel af spil:"
 
-#: base/main.cpp:463
+#: base/main.cpp:469
 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"
 
@@ -1189,25 +1189,25 @@ msgstr "~F~ortryd"
 msgid "~K~eys"
 msgstr "~T~aster"
 
-#: engines/engine.cpp:233
+#: engines/engine.cpp:235
 msgid "Could not initialize color format."
 msgstr ""
 
-#: engines/engine.cpp:241
+#: engines/engine.cpp:243
 #, fuzzy
 msgid "Could not switch to video mode: '"
 msgstr "Aktuel videotilstand:"
 
-#: engines/engine.cpp:250
+#: engines/engine.cpp:252
 #, fuzzy
 msgid "Could not apply aspect ratio setting."
 msgstr "Skift billedformat korrektion"
 
-#: engines/engine.cpp:255
+#: engines/engine.cpp:257
 msgid "Could not apply fullscreen setting."
 msgstr ""
 
-#: engines/engine.cpp:355
+#: engines/engine.cpp:357
 msgid ""
 "You appear to be playing this game directly\n"
 "from the CD. This is known to cause problems,\n"
@@ -1216,7 +1216,7 @@ msgid ""
 "See the README file for details."
 msgstr ""
 
-#: engines/engine.cpp:366
+#: engines/engine.cpp:368
 msgid ""
 "This game has audio tracks in its disk. These\n"
 "tracks need to be ripped from the disk using\n"
@@ -1225,14 +1225,14 @@ msgid ""
 "See the README file for details."
 msgstr ""
 
-#: engines/engine.cpp:433
+#: engines/engine.cpp:435
 msgid ""
 "WARNING: The game you are about to start is not yet fully supported by "
 "ScummVM. As such, it is likely to be unstable, and any saves you make might "
 "not work in future versions of ScummVM."
 msgstr ""
 
-#: engines/engine.cpp:436
+#: engines/engine.cpp:438
 msgid "Start anyway"
 msgstr ""
 
@@ -2012,56 +2012,56 @@ msgstr ""
 "\n"
 "%s"
 
-#: engines/kyra/lol.cpp:572
+#: engines/kyra/lol.cpp:478
 msgid "Attack 1"
 msgstr ""
 
-#: engines/kyra/lol.cpp:573
+#: engines/kyra/lol.cpp:479
 msgid "Attack 2"
 msgstr ""
 
-#: engines/kyra/lol.cpp:574
+#: engines/kyra/lol.cpp:480
 msgid "Attack 3"
 msgstr ""
 
-#: engines/kyra/lol.cpp:575
+#: engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr ""
 
-#: engines/kyra/lol.cpp:576
+#: engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr ""
 
-#: engines/kyra/lol.cpp:577
+#: engines/kyra/lol.cpp:483
 msgid "Slide Left"
 msgstr ""
 
-#: engines/kyra/lol.cpp:578
+#: engines/kyra/lol.cpp:484
 #, fuzzy
 msgid "Slide Right"
 msgstr "Højre"
 
-#: engines/kyra/lol.cpp:579
+#: engines/kyra/lol.cpp:485
 #, fuzzy
 msgid "Turn Left"
 msgstr "Sluk"
 
-#: engines/kyra/lol.cpp:580
+#: engines/kyra/lol.cpp:486
 #, fuzzy
 msgid "Turn Right"
 msgstr "Pil til højre"
 
-#: engines/kyra/lol.cpp:581
+#: engines/kyra/lol.cpp:487
 #, fuzzy
 msgid "Rest"
 msgstr "Gendan"
 
-#: engines/kyra/lol.cpp:582
+#: engines/kyra/lol.cpp:488
 #, fuzzy
 msgid "Options"
 msgstr "~I~ndstillinger"
 
-#: engines/kyra/lol.cpp:583
+#: engines/kyra/lol.cpp:489
 #, fuzzy
 msgid "Choose Spell"
 msgstr "Vælg"
@@ -2087,15 +2087,15 @@ msgid ""
 "Please (re)download it from www.scummvm.org"
 msgstr ""
 
-#: engines/sword1/animation.cpp:345 engines/sword2/animation.cpp:379
+#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379
 msgid "DXA cutscenes found but ScummVM has been built without zlib support"
 msgstr ""
 
-#: engines/sword1/animation.cpp:355 engines/sword2/animation.cpp:389
+#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389
 msgid "MPEG2 cutscenes are no longer supported"
 msgstr ""
 
-#: engines/sword1/animation.cpp:360 engines/sword2/animation.cpp:397
+#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397
 #, c-format
 msgid "Cutscene '%s' not found"
 msgstr ""
@@ -2357,26 +2357,26 @@ msgstr "Pegeplade tilstand aktiveret."
 msgid "Touchpad mode disabled."
 msgstr "Pegeplade tilstand deaktiveret."
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:67
+#: backends/platform/sdl/macosx/appmenu_osx.mm:78
 #, fuzzy
 msgid "Hide ScummVM"
 msgstr "Afslut ScummVM"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: backends/platform/sdl/macosx/appmenu_osx.mm:83
 msgid "Hide Others"
 msgstr ""
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:74
+#: backends/platform/sdl/macosx/appmenu_osx.mm:88
 msgid "Show All"
 msgstr ""
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:92
-#: backends/platform/sdl/macosx/appmenu_osx.mm:99
+#: backends/platform/sdl/macosx/appmenu_osx.mm:110
+#: backends/platform/sdl/macosx/appmenu_osx.mm:121
 #, fuzzy
 msgid "Window"
 msgstr "Windows MIDI"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:95
+#: backends/platform/sdl/macosx/appmenu_osx.mm:115
 msgid "Minimize"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 86a2ddf..927baf7 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2010-2012 ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Simon Sawatzki <SimSaw at gmx.de>, Lothar Serra Mari <Lothar at Windowsbase.de>, 2011.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.4.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2011-12-26 15:26+0100\n"
+"POT-Creation-Date: 2012-01-28 21:48+0100\n"
 "PO-Revision-Date: 2011-10-15 18:15+0100\n"
 "Last-Translator: Simon Sawatzki <SimSaw at gmx.de>\n"
 "Language-Team: Simon Sawatzki <SimSaw at gmx.de> (Lead), Lothar Serra Mari "
@@ -47,7 +47,7 @@ msgstr "Pfad hoch"
 #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
 #: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221
 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
-#: engines/engine.cpp:436 engines/scumm/dialogs.cpp:190
+#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190
 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
 #: backends/platform/wii/options.cpp:48
 #: backends/events/default/default-events.cpp:222
@@ -59,22 +59,22 @@ msgstr "Abbrechen"
 msgid "Choose"
 msgstr "Auswählen"
 
-#: gui/gui-manager.cpp:116 engines/scumm/help.cpp:125
+#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125
 #: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165
 #: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209
 #: backends/keymapper/remap-dialog.cpp:52
 msgid "Close"
 msgstr "Schließen"
 
-#: gui/gui-manager.cpp:119
+#: gui/gui-manager.cpp:118
 msgid "Mouse click"
 msgstr "Mausklick"
 
-#: gui/gui-manager.cpp:122 base/main.cpp:283
+#: gui/gui-manager.cpp:121 base/main.cpp:289
 msgid "Display keyboard"
 msgstr "Tastatur anzeigen"
 
-#: gui/gui-manager.cpp:125 base/main.cpp:286
+#: gui/gui-manager.cpp:124 base/main.cpp:292
 msgid "Remap keys"
 msgstr "Tasten neu zuweisen"
 
@@ -88,11 +88,11 @@ msgstr "Zuweisen"
 
 #: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959
 #: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222
-#: engines/engine.cpp:359 engines/engine.cpp:370 engines/scumm/dialogs.cpp:192
+#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
 #: engines/scumm/scumm.cpp:1784 engines/agos/animation.cpp:551
 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
-#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:345
-#: engines/sword1/animation.cpp:355 engines/sword1/animation.cpp:361
+#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449
+#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465
 #: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633
 #: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389
 #: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281
@@ -347,7 +347,7 @@ msgstr "Diese Spielkennung ist schon vergeben. Bitte eine andere w
 msgid "~Q~uit"
 msgstr "~B~eenden"
 
-#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:80
+#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96
 msgid "Quit ScummVM"
 msgstr "ScummVM beenden"
 
@@ -355,7 +355,7 @@ msgstr "ScummVM beenden"
 msgid "A~b~out..."
 msgstr "Übe~r~"
 
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:61
+#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70
 msgid "About ScummVM"
 msgstr "Über ScummVM"
 
@@ -973,28 +973,28 @@ msgstr "Unbenannt"
 msgid "Select a Theme"
 msgstr "Thema auswählen"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgid "Disabled GFX"
 msgstr "GFX ausgeschaltet"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgctxt "lowres"
 msgid "Disabled GFX"
 msgstr "GFX ausgeschaltet"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard Renderer (16bpp)"
 msgstr "Standard-Renderer (16bpp)"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard (16bpp)"
 msgstr "Standard (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased Renderer (16bpp)"
 msgstr "Kantenglättung (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased (16bpp)"
 msgstr "Kantenglättung (16bpp)"
 
@@ -1007,30 +1007,30 @@ msgstr "Wert l
 msgid "Engine does not support debug level '%s'"
 msgstr "Engine unterstützt den Debug-Level \"%s\" nicht."
 
-#: base/main.cpp:271
+#: base/main.cpp:277
 msgid "Menu"
 msgstr "Menü"
 
-#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:280 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:277 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50
 #: backends/platform/wince/CEActionsPocket.cpp:42
 msgid "Pause"
 msgstr "Pause"
 
-#: base/main.cpp:280
+#: base/main.cpp:286
 msgid "Skip line"
 msgstr "Zeile überspringen"
 
-#: base/main.cpp:439
+#: base/main.cpp:445
 msgid "Error running game:"
 msgstr "Fehler beim Ausführen des Spiels:"
 
-#: base/main.cpp:463
+#: base/main.cpp:469
 msgid "Could not find any engine capable of running the selected game"
 msgstr "Konnte keine Spiel-Engine finden, die dieses Spiel starten kann."
 
@@ -1206,23 +1206,23 @@ msgstr "~A~bbrechen"
 msgid "~K~eys"
 msgstr "~T~asten"
 
-#: engines/engine.cpp:233
+#: engines/engine.cpp:235
 msgid "Could not initialize color format."
 msgstr "Konnte Farbenformat nicht initialisieren."
 
-#: engines/engine.cpp:241
+#: engines/engine.cpp:243
 msgid "Could not switch to video mode: '"
 msgstr "Konnte nicht zu Grafikmodus wechseln: '"
 
-#: engines/engine.cpp:250
+#: engines/engine.cpp:252
 msgid "Could not apply aspect ratio setting."
 msgstr "Konnte Einstellung für Seitenverhältniskorrektur nicht anwenden."
 
-#: engines/engine.cpp:255
+#: engines/engine.cpp:257
 msgid "Could not apply fullscreen setting."
 msgstr "Konnte Einstellung für Vollbildmodus nicht anwenden."
 
-#: engines/engine.cpp:355
+#: engines/engine.cpp:357
 msgid ""
 "You appear to be playing this game directly\n"
 "from the CD. This is known to cause problems,\n"
@@ -1238,7 +1238,7 @@ msgstr ""
 "Lesen Sie die Liesmich-Datei für\n"
 "weitere Informationen."
 
-#: engines/engine.cpp:366
+#: engines/engine.cpp:368
 msgid ""
 "This game has audio tracks in its disk. These\n"
 "tracks need to be ripped from the disk using\n"
@@ -1253,7 +1253,7 @@ msgstr ""
 "Spiel hören zu können. Lesen Sie die\n"
 "Liesmich-Datei für weitere Informationen."
 
-#: engines/engine.cpp:433
+#: engines/engine.cpp:435
 msgid ""
 "WARNING: The game you are about to start is not yet fully supported by "
 "ScummVM. As such, it is likely to be unstable, and any saves you make might "
@@ -1264,7 +1264,7 @@ msgstr ""
 "und jegliche Spielstände, die Sie erstellen, könnten in zukünftigen "
 "Versionen von ScummVM nicht mehr funktionieren."
 
-#: engines/engine.cpp:436
+#: engines/engine.cpp:438
 msgid "Start anyway"
 msgstr "Trotzdem starten"
 
@@ -2025,56 +2025,56 @@ msgstr "Konnte Datei nicht l
 msgid "Failed to save game"
 msgstr "Konnte Spielstand nicht speichern."
 
-#: engines/kyra/lol.cpp:572
+#: engines/kyra/lol.cpp:478
 msgid "Attack 1"
 msgstr ""
 
-#: engines/kyra/lol.cpp:573
+#: engines/kyra/lol.cpp:479
 msgid "Attack 2"
 msgstr ""
 
-#: engines/kyra/lol.cpp:574
+#: engines/kyra/lol.cpp:480
 msgid "Attack 3"
 msgstr ""
 
-#: engines/kyra/lol.cpp:575
+#: engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr ""
 
-#: engines/kyra/lol.cpp:576
+#: engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr ""
 
-#: engines/kyra/lol.cpp:577
+#: engines/kyra/lol.cpp:483
 msgid "Slide Left"
 msgstr ""
 
-#: engines/kyra/lol.cpp:578
+#: engines/kyra/lol.cpp:484
 #, fuzzy
 msgid "Slide Right"
 msgstr "Rechts"
 
-#: engines/kyra/lol.cpp:579
+#: engines/kyra/lol.cpp:485
 #, fuzzy
 msgid "Turn Left"
 msgstr "Schalt aus"
 
-#: engines/kyra/lol.cpp:580
+#: engines/kyra/lol.cpp:486
 #, fuzzy
 msgid "Turn Right"
 msgstr "Zeiger nach rechts"
 
-#: engines/kyra/lol.cpp:581
+#: engines/kyra/lol.cpp:487
 #, fuzzy
 msgid "Rest"
 msgstr "Laden"
 
-#: engines/kyra/lol.cpp:582
+#: engines/kyra/lol.cpp:488
 #, fuzzy
 msgid "Options"
 msgstr "~O~ptionen"
 
-#: engines/kyra/lol.cpp:583
+#: engines/kyra/lol.cpp:489
 #, fuzzy
 msgid "Choose Spell"
 msgstr "Auswählen"
@@ -2112,17 +2112,17 @@ msgstr ""
 "Bitte laden Sie diese Datei (erneut) von\n"
 "www.scummvm.org herunter."
 
-#: engines/sword1/animation.cpp:345 engines/sword2/animation.cpp:379
+#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379
 msgid "DXA cutscenes found but ScummVM has been built without zlib support"
 msgstr ""
 "DXA-Zwischensequenzen gefunden, aber ScummVM wurde ohne Zlib-Unterstützung "
 "erstellt."
 
-#: engines/sword1/animation.cpp:355 engines/sword2/animation.cpp:389
+#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389
 msgid "MPEG2 cutscenes are no longer supported"
 msgstr "MPEG2-Zwischensequenzen werden nicht mehr unterstützt."
 
-#: engines/sword1/animation.cpp:360 engines/sword2/animation.cpp:397
+#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397
 #, c-format
 msgid "Cutscene '%s' not found"
 msgstr "Zwischensequenz \"%s\" gefunden"
@@ -2409,24 +2409,24 @@ msgstr "Touchpad-Modus aktiviert."
 msgid "Touchpad mode disabled."
 msgstr "Touchpad-Modus ausgeschaltet."
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:67
+#: backends/platform/sdl/macosx/appmenu_osx.mm:78
 msgid "Hide ScummVM"
 msgstr "ScummVM verbergen"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: backends/platform/sdl/macosx/appmenu_osx.mm:83
 msgid "Hide Others"
 msgstr "Andere verbergen"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:74
+#: backends/platform/sdl/macosx/appmenu_osx.mm:88
 msgid "Show All"
 msgstr "Alles zeigen"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:92
-#: backends/platform/sdl/macosx/appmenu_osx.mm:99
+#: backends/platform/sdl/macosx/appmenu_osx.mm:110
+#: backends/platform/sdl/macosx/appmenu_osx.mm:121
 msgid "Window"
 msgstr "Fenster"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:95
+#: backends/platform/sdl/macosx/appmenu_osx.mm:115
 msgid "Minimize"
 msgstr "Minimieren"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index b4712dd..5472df2 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 at lists.sf.net\n"
-"POT-Creation-Date: 2011-12-26 15:26+0100\n"
+"POT-Creation-Date: 2012-01-28 21:48+0100\n"
 "PO-Revision-Date: 2011-10-23 21:53+0100\n"
 "Last-Translator: Tomás Maidagan\n"
 "Language-Team: \n"
@@ -45,7 +45,7 @@ msgstr "Arriba"
 #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
 #: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221
 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
-#: engines/engine.cpp:436 engines/scumm/dialogs.cpp:190
+#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190
 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
 #: backends/platform/wii/options.cpp:48
 #: backends/events/default/default-events.cpp:222
@@ -57,22 +57,22 @@ msgstr "Cancelar"
 msgid "Choose"
 msgstr "Aceptar"
 
-#: gui/gui-manager.cpp:116 engines/scumm/help.cpp:125
+#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125
 #: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165
 #: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209
 #: backends/keymapper/remap-dialog.cpp:52
 msgid "Close"
 msgstr "Cerrar"
 
-#: gui/gui-manager.cpp:119
+#: gui/gui-manager.cpp:118
 msgid "Mouse click"
 msgstr "Clic de ratón"
 
-#: gui/gui-manager.cpp:122 base/main.cpp:283
+#: gui/gui-manager.cpp:121 base/main.cpp:289
 msgid "Display keyboard"
 msgstr "Mostrar el teclado"
 
-#: gui/gui-manager.cpp:125 base/main.cpp:286
+#: gui/gui-manager.cpp:124 base/main.cpp:292
 msgid "Remap keys"
 msgstr "Asignar teclas"
 
@@ -86,11 +86,11 @@ msgstr "Asignar"
 
 #: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959
 #: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222
-#: engines/engine.cpp:359 engines/engine.cpp:370 engines/scumm/dialogs.cpp:192
+#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
 #: engines/scumm/scumm.cpp:1784 engines/agos/animation.cpp:551
 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
-#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:345
-#: engines/sword1/animation.cpp:355 engines/sword1/animation.cpp:361
+#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449
+#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465
 #: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633
 #: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389
 #: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281
@@ -345,7 +345,7 @@ msgstr "Esta ID ya est
 msgid "~Q~uit"
 msgstr "~S~alir"
 
-#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:80
+#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96
 msgid "Quit ScummVM"
 msgstr "Cerrar ScummVM"
 
@@ -353,7 +353,7 @@ msgstr "Cerrar ScummVM"
 msgid "A~b~out..."
 msgstr "Acerca ~d~e"
 
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:61
+#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70
 msgid "About ScummVM"
 msgstr "Acerca de ScummVM"
 
@@ -963,28 +963,28 @@ msgstr "Partida sin nombre"
 msgid "Select a Theme"
 msgstr "Selecciona un tema"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgid "Disabled GFX"
 msgstr "GFX desactivados"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgctxt "lowres"
 msgid "Disabled GFX"
 msgstr "GFX desactivados"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard Renderer (16bpp)"
 msgstr "Estándar (16bpp)"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard (16bpp)"
 msgstr "Estándar (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased Renderer (16bpp)"
 msgstr "Suavizado (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased (16bpp)"
 msgstr "Suavizado (16bpp)"
 
@@ -997,30 +997,30 @@ msgstr "Eliminar valor"
 msgid "Engine does not support debug level '%s'"
 msgstr "El motor no soporta el nivel de debug '%s'"
 
-#: base/main.cpp:271
+#: base/main.cpp:277
 msgid "Menu"
 msgstr "Menú"
 
-#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:280 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:277 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50
 #: backends/platform/wince/CEActionsPocket.cpp:42
 msgid "Pause"
 msgstr "Pausar"
 
-#: base/main.cpp:280
+#: base/main.cpp:286
 msgid "Skip line"
 msgstr "Saltar frase"
 
-#: base/main.cpp:439
+#: base/main.cpp:445
 msgid "Error running game:"
 msgstr "Error al ejecutar el juego:"
 
-#: base/main.cpp:463
+#: base/main.cpp:469
 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"
 
@@ -1192,23 +1192,23 @@ msgstr "~C~ancelar"
 msgid "~K~eys"
 msgstr "~T~eclas"
 
-#: engines/engine.cpp:233
+#: engines/engine.cpp:235
 msgid "Could not initialize color format."
 msgstr "No se ha podido iniciar el formato de color."
 
-#: engines/engine.cpp:241
+#: engines/engine.cpp:243
 msgid "Could not switch to video mode: '"
 msgstr "No se ha podido cambiar al modo de video: '"
 
-#: engines/engine.cpp:250
+#: engines/engine.cpp:252
 msgid "Could not apply aspect ratio setting."
 msgstr "No se ha podido aplicar el ajuste de corrección de aspecto"
 
-#: engines/engine.cpp:255
+#: engines/engine.cpp:257
 msgid "Could not apply fullscreen setting."
 msgstr "No se ha podido aplicar el ajuste de pantalla completa."
 
-#: engines/engine.cpp:355
+#: engines/engine.cpp:357
 msgid ""
 "You appear to be playing this game directly\n"
 "from the CD. This is known to cause problems,\n"
@@ -1222,7 +1222,7 @@ msgstr ""
 "copiar los archivos del juego al disco duro.\n"
 "Consulta el archivo README para más detalles."
 
-#: engines/engine.cpp:366
+#: engines/engine.cpp:368
 msgid ""
 "This game has audio tracks in its disk. These\n"
 "tracks need to be ripped from the disk using\n"
@@ -1236,7 +1236,7 @@ msgstr ""
 "poder escuchar la música del juego.\n"
 "Consulta el archivo README para más detalles."
 
-#: engines/engine.cpp:433
+#: engines/engine.cpp:435
 msgid ""
 "WARNING: The game you are about to start is not yet fully supported by "
 "ScummVM. As such, it is likely to be unstable, and any saves you make might "
@@ -1246,7 +1246,7 @@ msgstr ""
 "ScummVM. Por lo tanto, puede que sea inestable, y que las partidas que "
 "guardes no funcionen en versiones futuras de ScummVM."
 
-#: engines/engine.cpp:436
+#: engines/engine.cpp:438
 msgid "Start anyway"
 msgstr "Jugar de todos modos"
 
@@ -2006,56 +2006,56 @@ msgstr "Fallo al borrar el archivo."
 msgid "Failed to save game"
 msgstr "Fallo al guardar la partida"
 
-#: engines/kyra/lol.cpp:572
+#: engines/kyra/lol.cpp:478
 msgid "Attack 1"
 msgstr ""
 
-#: engines/kyra/lol.cpp:573
+#: engines/kyra/lol.cpp:479
 msgid "Attack 2"
 msgstr ""
 
-#: engines/kyra/lol.cpp:574
+#: engines/kyra/lol.cpp:480
 msgid "Attack 3"
 msgstr ""
 
-#: engines/kyra/lol.cpp:575
+#: engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr ""
 
-#: engines/kyra/lol.cpp:576
+#: engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr ""
 
-#: engines/kyra/lol.cpp:577
+#: engines/kyra/lol.cpp:483
 msgid "Slide Left"
 msgstr ""
 
-#: engines/kyra/lol.cpp:578
+#: engines/kyra/lol.cpp:484
 #, fuzzy
 msgid "Slide Right"
 msgstr "Derecha"
 
-#: engines/kyra/lol.cpp:579
+#: engines/kyra/lol.cpp:485
 #, fuzzy
 msgid "Turn Left"
 msgstr "Apagar"
 
-#: engines/kyra/lol.cpp:580
+#: engines/kyra/lol.cpp:486
 #, fuzzy
 msgid "Turn Right"
 msgstr "Derecha"
 
-#: engines/kyra/lol.cpp:581
+#: engines/kyra/lol.cpp:487
 #, fuzzy
 msgid "Rest"
 msgstr "Cargar"
 
-#: engines/kyra/lol.cpp:582
+#: engines/kyra/lol.cpp:488
 #, fuzzy
 msgid "Options"
 msgstr "~O~pciones"
 
-#: engines/kyra/lol.cpp:583
+#: engines/kyra/lol.cpp:489
 #, fuzzy
 msgid "Choose Spell"
 msgstr "Aceptar"
@@ -2090,16 +2090,16 @@ msgstr ""
 "El archivo \"sky.cpt\" tiene un tamaño incorrecto.\n"
 "Por favor, vuelve a bajarlo de www.scummvm.org"
 
-#: engines/sword1/animation.cpp:345 engines/sword2/animation.cpp:379
+#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379
 msgid "DXA cutscenes found but ScummVM has been built without zlib support"
 msgstr ""
 "Se han encontrado vídeos DXA, pero se ha compilado ScummVM sin soporte zlib"
 
-#: engines/sword1/animation.cpp:355 engines/sword2/animation.cpp:389
+#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389
 msgid "MPEG2 cutscenes are no longer supported"
 msgstr "Los vídeos MPEG2 ya no son compatibles"
 
-#: engines/sword1/animation.cpp:360 engines/sword2/animation.cpp:397
+#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397
 #, c-format
 msgid "Cutscene '%s' not found"
 msgstr "No se ha encontrado el vídeo '%s'"
@@ -2386,24 +2386,24 @@ msgstr "Modo Touchpad activado."
 msgid "Touchpad mode disabled."
 msgstr "Modo Touchpad desactivado."
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:67
+#: backends/platform/sdl/macosx/appmenu_osx.mm:78
 msgid "Hide ScummVM"
 msgstr "Oculta ScummVM"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: backends/platform/sdl/macosx/appmenu_osx.mm:83
 msgid "Hide Others"
 msgstr "Ocultar otros"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:74
+#: backends/platform/sdl/macosx/appmenu_osx.mm:88
 msgid "Show All"
 msgstr "Mostrar todo"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:92
-#: backends/platform/sdl/macosx/appmenu_osx.mm:99
+#: backends/platform/sdl/macosx/appmenu_osx.mm:110
+#: backends/platform/sdl/macosx/appmenu_osx.mm:121
 msgid "Window"
 msgstr "Ventana"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:95
+#: backends/platform/sdl/macosx/appmenu_osx.mm:115
 msgid "Minimize"
 msgstr "Minimizar"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index c952fb3..c3f7675 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.3.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2011-12-26 15:26+0100\n"
+"POT-Creation-Date: 2012-01-28 21:48+0100\n"
 "PO-Revision-Date: 2011-10-23 14:52+0100\n"
 "Last-Translator: Thierry Crozat <criezy at scummvm.org>\n"
 "Language-Team: French <scummvm-devel at lists.sf.net>\n"
@@ -46,7 +46,7 @@ msgstr "Remonter"
 #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
 #: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221
 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
-#: engines/engine.cpp:436 engines/scumm/dialogs.cpp:190
+#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190
 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
 #: backends/platform/wii/options.cpp:48
 #: backends/events/default/default-events.cpp:222
@@ -58,22 +58,22 @@ msgstr "Annuler"
 msgid "Choose"
 msgstr "Choisir"
 
-#: gui/gui-manager.cpp:116 engines/scumm/help.cpp:125
+#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125
 #: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165
 #: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209
 #: backends/keymapper/remap-dialog.cpp:52
 msgid "Close"
 msgstr "Fermer"
 
-#: gui/gui-manager.cpp:119
+#: gui/gui-manager.cpp:118
 msgid "Mouse click"
 msgstr "Clic de souris"
 
-#: gui/gui-manager.cpp:122 base/main.cpp:283
+#: gui/gui-manager.cpp:121 base/main.cpp:289
 msgid "Display keyboard"
 msgstr "Afficher le clavier"
 
-#: gui/gui-manager.cpp:125 base/main.cpp:286
+#: gui/gui-manager.cpp:124 base/main.cpp:292
 msgid "Remap keys"
 msgstr "Changer l'affectation des touches"
 
@@ -87,11 +87,11 @@ msgstr "Affecter"
 
 #: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959
 #: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222
-#: engines/engine.cpp:359 engines/engine.cpp:370 engines/scumm/dialogs.cpp:192
+#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
 #: engines/scumm/scumm.cpp:1784 engines/agos/animation.cpp:551
 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
-#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:345
-#: engines/sword1/animation.cpp:355 engines/sword1/animation.cpp:361
+#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449
+#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465
 #: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633
 #: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389
 #: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281
@@ -346,7 +346,7 @@ msgstr "Cet ID est d
 msgid "~Q~uit"
 msgstr "~Q~uitter"
 
-#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:80
+#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96
 msgid "Quit ScummVM"
 msgstr "Quitter ScummVM"
 
@@ -354,7 +354,7 @@ msgstr "Quitter ScummVM"
 msgid "A~b~out..."
 msgstr "À ~P~ropos..."
 
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:61
+#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70
 msgid "About ScummVM"
 msgstr "À propos de ScummVM"
 
@@ -969,28 +969,28 @@ msgstr "Sauvegarde sans nom"
 msgid "Select a Theme"
 msgstr "Sélectionnez un Thème"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgid "Disabled GFX"
 msgstr "GFX désactivé"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgctxt "lowres"
 msgid "Disabled GFX"
 msgstr "GFX désactivé"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard Renderer (16bpp)"
 msgstr "Rendu Standard (16bpp)"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard (16bpp)"
 msgstr "Standard (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased Renderer (16bpp)"
 msgstr "Rendu Anti-crénelé (16 bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased (16bpp)"
 msgstr "Anti-crénelé (16 bpp)"
 
@@ -1003,30 +1003,30 @@ msgstr "Effacer la valeur"
 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:271
+#: base/main.cpp:277
 msgid "Menu"
 msgstr "Menu"
 
-#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:280 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:277 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50
 #: backends/platform/wince/CEActionsPocket.cpp:42
 msgid "Pause"
 msgstr "Mettre en pause"
 
-#: base/main.cpp:280
+#: base/main.cpp:286
 msgid "Skip line"
 msgstr "Passer la phrase"
 
-#: base/main.cpp:439
+#: base/main.cpp:445
 msgid "Error running game:"
 msgstr "Erreur lors de l'éxécution du jeu:"
 
-#: base/main.cpp:463
+#: base/main.cpp:469
 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é"
 
@@ -1200,23 +1200,23 @@ msgstr "~A~nnuler"
 msgid "~K~eys"
 msgstr "~T~ouches"
 
-#: engines/engine.cpp:233
+#: engines/engine.cpp:235
 msgid "Could not initialize color format."
 msgstr "Impossible d'initialiser le format des couleurs."
 
-#: engines/engine.cpp:241
+#: engines/engine.cpp:243
 msgid "Could not switch to video mode: '"
 msgstr "Impossible de changer le mode vidéo à: '"
 
-#: engines/engine.cpp:250
+#: engines/engine.cpp:252
 msgid "Could not apply aspect ratio setting."
 msgstr "Impossible d'appliquer la correction du rapport d'aspect."
 
-#: engines/engine.cpp:255
+#: engines/engine.cpp:257
 msgid "Could not apply fullscreen setting."
 msgstr "Impossible d'appliquer l'option plein écran."
 
-#: engines/engine.cpp:355
+#: engines/engine.cpp:357
 msgid ""
 "You appear to be playing this game directly\n"
 "from the CD. This is known to cause problems,\n"
@@ -1230,7 +1230,7 @@ msgstr ""
 "données du jeu sur votre disque dur.\n"
 "Lisez le fichier README pour plus de détails."
 
-#: engines/engine.cpp:366
+#: engines/engine.cpp:368
 msgid ""
 "This game has audio tracks in its disk. These\n"
 "tracks need to be ripped from the disk using\n"
@@ -1244,7 +1244,7 @@ msgstr ""
 "logiciel approprié.\n"
 "Lisez le fichier README pour plus de détails."
 
-#: engines/engine.cpp:433
+#: engines/engine.cpp:435
 msgid ""
 "WARNING: The game you are about to start is not yet fully supported by "
 "ScummVM. As such, it is likely to be unstable, and any saves you make might "
@@ -1254,7 +1254,7 @@ msgstr ""
 "complètement supporté par ScummVM. Il est donc instable et les sauvegardes "
 "peuvent ne pas  marcher avec une future version de ScummVM."
 
-#: engines/engine.cpp:436
+#: engines/engine.cpp:438
 msgid "Start anyway"
 msgstr "Jouer quand même"
 
@@ -2015,56 +2015,56 @@ msgstr "
 msgid "Failed to save game"
 msgstr "Échec de la sauvegarde."
 
-#: engines/kyra/lol.cpp:572
+#: engines/kyra/lol.cpp:478
 msgid "Attack 1"
 msgstr ""
 
-#: engines/kyra/lol.cpp:573
+#: engines/kyra/lol.cpp:479
 msgid "Attack 2"
 msgstr ""
 
-#: engines/kyra/lol.cpp:574
+#: engines/kyra/lol.cpp:480
 msgid "Attack 3"
 msgstr ""
 
-#: engines/kyra/lol.cpp:575
+#: engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr ""
 
-#: engines/kyra/lol.cpp:576
+#: engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr ""
 
-#: engines/kyra/lol.cpp:577
+#: engines/kyra/lol.cpp:483
 msgid "Slide Left"
 msgstr ""
 
-#: engines/kyra/lol.cpp:578
+#: engines/kyra/lol.cpp:484
 #, fuzzy
 msgid "Slide Right"
 msgstr "Droite"
 
-#: engines/kyra/lol.cpp:579
+#: engines/kyra/lol.cpp:485
 #, fuzzy
 msgid "Turn Left"
 msgstr "Éteindre"
 
-#: engines/kyra/lol.cpp:580
+#: engines/kyra/lol.cpp:486
 #, fuzzy
 msgid "Turn Right"
 msgstr "Droit"
 
-#: engines/kyra/lol.cpp:581
+#: engines/kyra/lol.cpp:487
 #, fuzzy
 msgid "Rest"
 msgstr "Charger"
 
-#: engines/kyra/lol.cpp:582
+#: engines/kyra/lol.cpp:488
 #, fuzzy
 msgid "Options"
 msgstr "~O~ptions"
 
-#: engines/kyra/lol.cpp:583
+#: engines/kyra/lol.cpp:489
 #, fuzzy
 msgid "Choose Spell"
 msgstr "Choisir"
@@ -2099,17 +2099,17 @@ msgstr ""
 "Le fichier \"sky.cpt\" a une taille incorrecte.\n"
 "Vous pouvez le (re)télécharger sur www.scummvm.org"
 
-#: engines/sword1/animation.cpp:345 engines/sword2/animation.cpp:379
+#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379
 msgid "DXA cutscenes found but ScummVM has been built without zlib support"
 msgstr ""
 "Les séquences DXA sont présente mais ScummVM a été compilé sans le support "
 "zlib."
 
-#: engines/sword1/animation.cpp:355 engines/sword2/animation.cpp:389
+#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389
 msgid "MPEG2 cutscenes are no longer supported"
 msgstr "Les séquences MPEG2 ne sont plus supportées"
 
-#: engines/sword1/animation.cpp:360 engines/sword2/animation.cpp:397
+#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397
 #, c-format
 msgid "Cutscene '%s' not found"
 msgstr "Séquence '%s' non trouvé"
@@ -2394,24 +2394,24 @@ msgstr "Mode touchpad activ
 msgid "Touchpad mode disabled."
 msgstr "Mode touchpad désactivé"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:67
+#: backends/platform/sdl/macosx/appmenu_osx.mm:78
 msgid "Hide ScummVM"
 msgstr "Cacher ScummVM"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: backends/platform/sdl/macosx/appmenu_osx.mm:83
 msgid "Hide Others"
 msgstr "Masquer les Autres"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:74
+#: backends/platform/sdl/macosx/appmenu_osx.mm:88
 msgid "Show All"
 msgstr "Tout Afficher"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:92
-#: backends/platform/sdl/macosx/appmenu_osx.mm:99
+#: backends/platform/sdl/macosx/appmenu_osx.mm:110
+#: backends/platform/sdl/macosx/appmenu_osx.mm:121
 msgid "Window"
 msgstr "Fenêtre"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:95
+#: backends/platform/sdl/macosx/appmenu_osx.mm:115
 msgid "Minimize"
 msgstr "Minimiser"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index b9549a3..96cdefc 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.3.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2011-12-26 15:26+0100\n"
+"POT-Creation-Date: 2012-01-28 21:48+0100\n"
 "PO-Revision-Date: 2011-12-31 08:50+0100\n"
 "Last-Translator: Gruby <grubycza at hotmail.com>\n"
 "Language-Team: Hungarian\n"
+"Language: Magyar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: Magyar\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
@@ -49,7 +49,7 @@ msgstr "Feljebb"
 #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
 #: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221
 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
-#: engines/engine.cpp:436 engines/scumm/dialogs.cpp:190
+#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190
 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
 #: backends/platform/wii/options.cpp:48
 #: backends/events/default/default-events.cpp:222
@@ -61,22 +61,22 @@ msgstr "M
 msgid "Choose"
 msgstr "Választ"
 
-#: gui/gui-manager.cpp:116 engines/scumm/help.cpp:125
+#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125
 #: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165
 #: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209
 #: backends/keymapper/remap-dialog.cpp:52
 msgid "Close"
 msgstr "Bezár"
 
-#: gui/gui-manager.cpp:119
+#: gui/gui-manager.cpp:118
 msgid "Mouse click"
 msgstr "Egérkattintás"
 
-#: gui/gui-manager.cpp:122 base/main.cpp:283
+#: gui/gui-manager.cpp:121 base/main.cpp:289
 msgid "Display keyboard"
 msgstr "Billentyûzet beállítások"
 
-#: gui/gui-manager.cpp:125 base/main.cpp:286
+#: gui/gui-manager.cpp:124 base/main.cpp:292
 msgid "Remap keys"
 msgstr "Billentyûk átállítása"
 
@@ -90,11 +90,11 @@ msgstr "Kioszt
 
 #: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959
 #: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222
-#: engines/engine.cpp:359 engines/engine.cpp:370 engines/scumm/dialogs.cpp:192
+#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
 #: engines/scumm/scumm.cpp:1784 engines/agos/animation.cpp:551
 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
-#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:345
-#: engines/sword1/animation.cpp:355 engines/sword1/animation.cpp:361
+#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449
+#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465
 #: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633
 #: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389
 #: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281
@@ -347,7 +347,7 @@ msgstr "Ez a j
 msgid "~Q~uit"
 msgstr "Kilépés"
 
-#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:80
+#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96
 msgid "Quit ScummVM"
 msgstr "ScummVM bezárása"
 
@@ -355,7 +355,7 @@ msgstr "ScummVM bez
 msgid "A~b~out..."
 msgstr "Névjegy"
 
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:61
+#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70
 msgid "About ScummVM"
 msgstr "ScummVM névjegy"
 
@@ -957,28 +957,28 @@ msgstr "N
 msgid "Select a Theme"
 msgstr "Válassz témát"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgid "Disabled GFX"
 msgstr "GFX letiltva"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgctxt "lowres"
 msgid "Disabled GFX"
 msgstr "GFX letiltva"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard Renderer (16bpp)"
 msgstr "Standard leképezõ (16bpp)"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard (16bpp)"
 msgstr "Standard (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased Renderer (16bpp)"
 msgstr "Élsimításos leképezõ (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased (16bpp)"
 msgstr "Élsimított (16bpp)"
 
@@ -991,30 +991,30 @@ msgstr "
 msgid "Engine does not support debug level '%s'"
 msgstr "A motor nem támogatja a '%s' debug szintet"
 
-#: base/main.cpp:271
+#: base/main.cpp:277
 msgid "Menu"
 msgstr "Menü"
 
-#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:280 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:277 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50
 #: backends/platform/wince/CEActionsPocket.cpp:42
 msgid "Pause"
 msgstr "Szünet"
 
-#: base/main.cpp:280
+#: base/main.cpp:286
 msgid "Skip line"
 msgstr "Sor átlépése"
 
-#: base/main.cpp:439
+#: base/main.cpp:445
 msgid "Error running game:"
 msgstr "Hiba a játék futtatásakor:"
 
-#: base/main.cpp:463
+#: base/main.cpp:469
 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"
 
@@ -1185,23 +1185,23 @@ msgstr "M
 msgid "~K~eys"
 msgstr "Billentyük"
 
-#: engines/engine.cpp:233
+#: engines/engine.cpp:235
 msgid "Could not initialize color format."
 msgstr "Szín formátum nincs alkalmazva"
 
-#: engines/engine.cpp:241
+#: engines/engine.cpp:243
 msgid "Could not switch to video mode: '"
 msgstr "Videómód nincs átállítva: ' "
 
-#: engines/engine.cpp:250
+#: engines/engine.cpp:252
 msgid "Could not apply aspect ratio setting."
 msgstr "Méretarány korrekció nem változott."
 
-#: engines/engine.cpp:255
+#: engines/engine.cpp:257
 msgid "Could not apply fullscreen setting."
 msgstr "Teljesképernyõs beállítás nincs alkalmazva"
 
-#: engines/engine.cpp:355
+#: engines/engine.cpp:357
 msgid ""
 "You appear to be playing this game directly\n"
 "from the CD. This is known to cause problems,\n"
@@ -1215,7 +1215,7 @@ msgstr ""
 "adatfájljait a merevlemezedre.\n"
 "Nézd meg a README fájlt a részletekért."
 
-#: engines/engine.cpp:366
+#: engines/engine.cpp:368
 msgid ""
 "This game has audio tracks in its disk. These\n"
 "tracks need to be ripped from the disk using\n"
@@ -1229,7 +1229,7 @@ msgstr ""
 "hogy a játék zenéje hallható legyen.\n"
 "Nézd meg a README fájlt a részletekért."
 
-#: engines/engine.cpp:433
+#: engines/engine.cpp:435
 msgid ""
 "WARNING: The game you are about to start is not yet fully supported by "
 "ScummVM. As such, it is likely to be unstable, and any saves you make might "
@@ -1239,7 +1239,7 @@ msgstr ""
 "ScummVM. Számíts rá hogy nem stabilan fut, és a mentések nem mûködnek a "
 "jövõbeni ScummVM verziókkal."
 
-#: engines/engine.cpp:436
+#: engines/engine.cpp:438
 msgid "Start anyway"
 msgstr "Indítás így is"
 
@@ -1998,51 +1998,51 @@ msgstr "F
 msgid "Failed to save game"
 msgstr "Játék mentés nem sikerült"
 
-#: engines/kyra/lol.cpp:572
+#: engines/kyra/lol.cpp:478
 msgid "Attack 1"
 msgstr "Támadás 1"
 
-#: engines/kyra/lol.cpp:573
+#: engines/kyra/lol.cpp:479
 msgid "Attack 2"
 msgstr "Támadás 2"
 
-#: engines/kyra/lol.cpp:574
+#: engines/kyra/lol.cpp:480
 msgid "Attack 3"
 msgstr "Támadás 3"
 
-#: engines/kyra/lol.cpp:575
+#: engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Mozgás elõre"
 
-#: engines/kyra/lol.cpp:576
+#: engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Mozgás hátra"
 
-#: engines/kyra/lol.cpp:577
+#: engines/kyra/lol.cpp:483
 msgid "Slide Left"
 msgstr "Siklás balra"
 
-#: engines/kyra/lol.cpp:578
+#: engines/kyra/lol.cpp:484
 msgid "Slide Right"
 msgstr "Siklás jobbra"
 
-#: engines/kyra/lol.cpp:579
+#: engines/kyra/lol.cpp:485
 msgid "Turn Left"
 msgstr "Balra fordul"
 
-#: engines/kyra/lol.cpp:580
+#: engines/kyra/lol.cpp:486
 msgid "Turn Right"
 msgstr "Jobbra fordul"
 
-#: engines/kyra/lol.cpp:581
+#: engines/kyra/lol.cpp:487
 msgid "Rest"
 msgstr "Pihenés"
 
-#: engines/kyra/lol.cpp:582
+#: engines/kyra/lol.cpp:488
 msgid "Options"
 msgstr "Opciók"
 
-#: engines/kyra/lol.cpp:583
+#: engines/kyra/lol.cpp:489
 msgid "Choose Spell"
 msgstr "Válassz varázslatot"
 
@@ -2076,15 +2076,15 @@ msgstr ""
 "A \"sky.cpt\" fájl mérete nem megfelelõ.\n"
 "Töltsd le a www.scummvm.org oldaláról"
 
-#: engines/sword1/animation.cpp:345 engines/sword2/animation.cpp:379
+#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379
 msgid "DXA cutscenes found but ScummVM has been built without zlib support"
 msgstr "DXA átvezetõ elérhetõ, de a ScummVM zlib támogatás nincs lefordítva"
 
-#: engines/sword1/animation.cpp:355 engines/sword2/animation.cpp:389
+#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389
 msgid "MPEG2 cutscenes are no longer supported"
 msgstr "MPEG2 átvezetõk már nem támogatottak"
 
-#: engines/sword1/animation.cpp:360 engines/sword2/animation.cpp:397
+#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397
 #, c-format
 msgid "Cutscene '%s' not found"
 msgstr "'%s' átvezetõ nem található"
@@ -2368,24 +2368,24 @@ msgstr "Touchpad m
 msgid "Touchpad mode disabled."
 msgstr "Touchpad mód letiltva."
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:67
+#: backends/platform/sdl/macosx/appmenu_osx.mm:78
 msgid "Hide ScummVM"
 msgstr "ScummVM elrejtése"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: backends/platform/sdl/macosx/appmenu_osx.mm:83
 msgid "Hide Others"
 msgstr "Többi elrejtése"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:74
+#: backends/platform/sdl/macosx/appmenu_osx.mm:88
 msgid "Show All"
 msgstr "Mutasd mind"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:92
-#: backends/platform/sdl/macosx/appmenu_osx.mm:99
+#: backends/platform/sdl/macosx/appmenu_osx.mm:110
+#: backends/platform/sdl/macosx/appmenu_osx.mm:121
 msgid "Window"
 msgstr "Ablak"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:95
+#: backends/platform/sdl/macosx/appmenu_osx.mm:115
 msgid "Minimize"
 msgstr "Kis méret"
 
diff --git a/po/iso-8859-2.cp b/po/iso-8859-2.cp
new file mode 100644
index 0000000..f8e673b
--- /dev/null
+++ b/po/iso-8859-2.cp
@@ -0,0 +1,320 @@
+# 0x00 (  0)
+0 0    # Not required
+1 0    # Not required
+2 0    # Not required
+3 0    # Not required
+# 0x04 (  4)
+4 0    # Not required
+5 0    # Not required
+6 0    # Not required
+7 0    # Not required
+# 0x08 (  8)
+8 0    # Not required
+9 0    # Not required
+10 0    # Not required
+11 0    # Not required
+# 0x0C ( 12)
+12 0    # Not required
+13 0    # Not required
+14 0    # Not required
+15 0    # Not required
+# 0x10 ( 16)
+16 0    # Not required
+17 0    # Not required
+18 0    # Not required
+19 0    # Not required
+# 0x14 ( 20)
+20 0    # Not required
+21 0    # Not required
+22 0    # Not required
+23 0    # Not required
+# 0x18 ( 24)
+24 0    # Not required
+25 0    # Not required
+26 0    # Not required
+27 0    # Not required
+# 0x1C ( 28)
+28 0    # Not required
+29 0    # Not required
+30 0    # Not required
+31 0    # Not required
+# 0x20 ( 32)
+32
+33
+34
+35
+# 0x24 ( 36)
+36
+37
+38
+39
+# 0x28 ( 40)
+40
+41
+42
+43
+# 0x2C ( 44)
+44
+45
+46
+47
+# 0x30 ( 48)
+48
+49
+50
+51
+# 0x34 ( 52)
+52
+53
+54
+55
+# 0x38 ( 56)
+56
+57
+58
+59
+# 0x3C ( 60)
+60
+61
+62
+63
+# 0x40 ( 64)
+64
+65
+66
+67
+# 0x44 ( 68)
+68
+69
+70
+71
+# 0x48 ( 72)
+72
+73
+74
+75
+# 0x4C ( 76)
+76
+77
+78
+79
+# 0x50 ( 80)
+80
+81
+82
+83
+# 0x54 ( 84)
+84
+85
+86
+87
+# 0x58 ( 88)
+88
+89
+90
+91
+# 0x5C ( 92)
+92
+93
+94
+95
+# 0x60 ( 96)
+96
+97
+98
+99
+# 0x64 (100)
+100
+101
+102
+103
+# 0x68 (104)
+104
+105
+106
+107
+# 0x6C (108)
+108
+109
+110
+111
+# 0x70 (112)
+112
+113
+114
+115
+# 0x74 (116)
+116
+117
+118
+119
+# 0x78 (120)
+120
+121
+122
+123
+# 0x7C (124)
+124
+125
+126
+127 0    # Not required
+# 0x80 (128)
+128 0    # Not required
+129 0    # Not required
+130 0    # Not required
+131 0    # Not required
+# 0x84 (132)
+132 0    # Not required
+133 0    # Not required
+134 0    # Not required
+135 0    # Not required
+# 0x88 (136)
+136 0    # Not required
+137 0    # Not required
+138 0    # Not required
+139 0    # Not required
+# 0x8C (140)
+140 0    # Not required
+141 0    # Not required
+142 0    # Not required
+143 0    # Not required
+# 0x90 (144)
+144 0    # Not required
+145 0    # Not required
+146 0    # Not required
+147 0    # Not required
+# 0x94 (148)
+148 0    # Not required
+149 0    # Not required
+150 0    # Not required
+151 0    # Not required
+# 0x98 (152)
+152 0    # Not required
+153 0    # Not required
+154 0    # Not required
+155 0    # Not required
+# 0x9C (156)
+156 0    # Not required
+157 0    # Not required
+158 0    # Not required
+159 0    # Not required
+# 0xA0 (160)
+160
+260
+728
+321
+# 0xA4 (164)
+164
+317
+346
+167
+# 0xA8 (168)
+168
+352
+350
+356
+# 0xAC (172)
+377
+173
+381
+379
+# 0xB0 (176)
+176
+261
+731
+322
+# 0xB4 (180)
+180
+318
+347
+711
+# 0xB8 (184)
+184
+353
+351
+357
+# 0xBC (188)
+378
+733
+382
+380
+# 0xC0 (192)
+340
+193
+194
+258
+# 0xC4 (196)
+196
+313
+262
+199
+# 0xC8 (200)
+268
+201
+280
+203
+# 0xCC (204)
+282
+205
+206
+270
+# 0xD0 (208)
+272
+323
+327
+211
+# 0xD4 (212)
+212
+336
+214
+215
+# 0xD8 (216)
+344
+366
+218
+368
+# 0xDC (220)
+220
+221
+354
+223
+# 0xE0 (224)
+341
+225
+226
+259
+# 0xE4 (228)
+228
+314
+263
+231
+# 0xE8 (232)
+269
+233
+281
+235
+# 0xEC (236)
+283
+237
+238
+271
+# 0xF0 (240)
+273
+324
+328
+243
+# 0xF4 (244)
+244
+337
+246
+247
+# 0xF8 (248)
+345
+367
+250
+369
+# 0xFC (252)
+252
+253
+355
+729
diff --git a/po/iso-8859-5.cp b/po/iso-8859-5.cp
new file mode 100644
index 0000000..4735010
--- /dev/null
+++ b/po/iso-8859-5.cp
@@ -0,0 +1,320 @@
+# 0x00 (  0)
+0 0    # Not required
+1 0    # Not required
+2 0    # Not required
+3 0    # Not required
+# 0x04 (  4)
+4 0    # Not required
+5 0    # Not required
+6 0    # Not required
+7 0    # Not required
+# 0x08 (  8)
+8 0    # Not required
+9 0    # Not required
+10 0    # Not required
+11 0    # Not required
+# 0x0C ( 12)
+12 0    # Not required
+13 0    # Not required
+14 0    # Not required
+15 0    # Not required
+# 0x10 ( 16)
+16 0    # Not required
+17 0    # Not required
+18 0    # Not required
+19 0    # Not required
+# 0x14 ( 20)
+20 0    # Not required
+21 0    # Not required
+22 0    # Not required
+23 0    # Not required
+# 0x18 ( 24)
+24 0    # Not required
+25 0    # Not required
+26 0    # Not required
+27 0    # Not required
+# 0x1C ( 28)
+28 0    # Not required
+29 0    # Not required
+30 0    # Not required
+31 0    # Not required
+# 0x20 ( 32)
+32
+33
+34
+35
+# 0x24 ( 36)
+36
+37
+38
+39
+# 0x28 ( 40)
+40
+41
+42
+43
+# 0x2C ( 44)
+44
+45
+46
+47
+# 0x30 ( 48)
+48
+49
+50
+51
+# 0x34 ( 52)
+52
+53
+54
+55
+# 0x38 ( 56)
+56
+57
+58
+59
+# 0x3C ( 60)
+60
+61
+62
+63
+# 0x40 ( 64)
+64
+65
+66
+67
+# 0x44 ( 68)
+68
+69
+70
+71
+# 0x48 ( 72)
+72
+73
+74
+75
+# 0x4C ( 76)
+76
+77
+78
+79
+# 0x50 ( 80)
+80
+81
+82
+83
+# 0x54 ( 84)
+84
+85
+86
+87
+# 0x58 ( 88)
+88
+89
+90
+91
+# 0x5C ( 92)
+92
+93
+94
+95
+# 0x60 ( 96)
+96
+97
+98
+99
+# 0x64 (100)
+100
+101
+102
+103
+# 0x68 (104)
+104
+105
+106
+107
+# 0x6C (108)
+108
+109
+110
+111
+# 0x70 (112)
+112
+113
+114
+115
+# 0x74 (116)
+116
+117
+118
+119
+# 0x78 (120)
+120
+121
+122
+123
+# 0x7C (124)
+124
+125
+126
+127 0    # Not required
+# 0x80 (128)
+128 0    # Not required
+129 0    # Not required
+130 0    # Not required
+131 0    # Not required
+# 0x84 (132)
+132 0    # Not required
+133 0    # Not required
+134 0    # Not required
+135 0    # Not required
+# 0x88 (136)
+136 0    # Not required
+137 0    # Not required
+138 0    # Not required
+139 0    # Not required
+# 0x8C (140)
+140 0    # Not required
+141 0    # Not required
+142 0    # Not required
+143 0    # Not required
+# 0x90 (144)
+144 0    # Not required
+145 0    # Not required
+146 0    # Not required
+147 0    # Not required
+# 0x94 (148)
+148 0    # Not required
+149 0    # Not required
+150 0    # Not required
+151 0    # Not required
+# 0x98 (152)
+152 0    # Not required
+153 0    # Not required
+154 0    # Not required
+155 0    # Not required
+# 0x9C (156)
+156 0    # Not required
+157 0    # Not required
+158 0    # Not required
+159 0    # Not required
+# 0xA0 (160)
+160
+1025
+1026
+1027
+# 0xA4 (164)
+1028
+1029
+1030
+1031
+# 0xA8 (168)
+1032
+1033
+1034
+1035
+# 0xAC (172)
+1036
+173
+1038
+1039
+# 0xB0 (176)
+1040
+1041
+1042
+1043
+# 0xB4 (180)
+1044
+1045
+1046
+1047
+# 0xB8 (184)
+1048
+1049
+1050
+1051
+# 0xBC (188)
+1052
+1053
+1054
+1055
+# 0xC0 (192)
+1056
+1057
+1058
+1059
+# 0xC4 (196)
+1060
+1061
+1062
+1063
+# 0xC8 (200)
+1064
+1065
+1066
+1067
+# 0xCC (204)
+1068
+1069
+1070
+1071
+# 0xD0 (208)
+1072
+1073
+1074
+1075
+# 0xD4 (212)
+1076
+1077
+1078
+1079
+# 0xD8 (216)
+1080
+1081
+1082
+1083
+# 0xDC (220)
+1084
+1085
+1086
+1087
+# 0xE0 (224)
+1088
+1089
+1090
+1091
+# 0xE4 (228)
+1092
+1093
+1094
+1095
+# 0xE8 (232)
+1096
+1097
+1098
+1099
+# 0xEC (236)
+1100
+1101
+1102
+1103
+# 0xF0 (240)
+8470
+1105
+1106
+1107
+# 0xF4 (244)
+1108
+1109
+1110
+1111
+# 0xF8 (248)
+1112
+1113
+1114
+1115
+# 0xFC (252)
+1116
+167
+1118
+1119
diff --git a/po/it_IT.po b/po/it_IT.po
index ce81010..b988f78 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 at lists.sf.net\n"
-"POT-Creation-Date: 2011-12-26 15:26+0100\n"
+"POT-Creation-Date: 2012-01-28 21:48+0100\n"
 "PO-Revision-Date: 2011-10-08 17:29+0100\n"
 "Last-Translator: Matteo 'Maff' Angelino <matteo.maff at gmail dot com>\n"
 "Language-Team: Italian\n"
@@ -45,7 +45,7 @@ msgstr "Su"
 #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
 #: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221
 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
-#: engines/engine.cpp:436 engines/scumm/dialogs.cpp:190
+#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190
 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
 #: backends/platform/wii/options.cpp:48
 #: backends/events/default/default-events.cpp:222
@@ -57,22 +57,22 @@ msgstr "Annulla"
 msgid "Choose"
 msgstr "Scegli"
 
-#: gui/gui-manager.cpp:116 engines/scumm/help.cpp:125
+#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125
 #: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165
 #: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209
 #: backends/keymapper/remap-dialog.cpp:52
 msgid "Close"
 msgstr "Chiudi"
 
-#: gui/gui-manager.cpp:119
+#: gui/gui-manager.cpp:118
 msgid "Mouse click"
 msgstr "Clic del mouse"
 
-#: gui/gui-manager.cpp:122 base/main.cpp:283
+#: gui/gui-manager.cpp:121 base/main.cpp:289
 msgid "Display keyboard"
 msgstr "Mostra tastiera"
 
-#: gui/gui-manager.cpp:125 base/main.cpp:286
+#: gui/gui-manager.cpp:124 base/main.cpp:292
 msgid "Remap keys"
 msgstr "Riprogramma tasti"
 
@@ -86,11 +86,11 @@ msgstr "Mappa"
 
 #: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959
 #: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222
-#: engines/engine.cpp:359 engines/engine.cpp:370 engines/scumm/dialogs.cpp:192
+#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
 #: engines/scumm/scumm.cpp:1784 engines/agos/animation.cpp:551
 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
-#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:345
-#: engines/sword1/animation.cpp:355 engines/sword1/animation.cpp:361
+#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449
+#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465
 #: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633
 #: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389
 #: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281
@@ -344,7 +344,7 @@ msgstr "Questo ID di gioco 
 msgid "~Q~uit"
 msgstr "C~h~iudi"
 
-#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:80
+#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96
 msgid "Quit ScummVM"
 msgstr "Chiudi ScummVM"
 
@@ -352,7 +352,7 @@ msgstr "Chiudi ScummVM"
 msgid "A~b~out..."
 msgstr "~I~nfo..."
 
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:61
+#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70
 msgid "About ScummVM"
 msgstr "Informazioni su ScummVM"
 
@@ -963,28 +963,28 @@ msgstr "Salvataggio senza titolo"
 msgid "Select a Theme"
 msgstr "Seleziona un tema"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgid "Disabled GFX"
 msgstr "Grafica disattivata"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgctxt "lowres"
 msgid "Disabled GFX"
 msgstr "Grafica disattivata"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard Renderer (16bpp)"
 msgstr "Renderer standard (16bpp)"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard (16bpp)"
 msgstr "Standard (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased Renderer (16bpp)"
 msgstr "Renderer con antialiasing (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased (16bpp)"
 msgstr "Con antialiasing (16bpp)"
 
@@ -997,30 +997,30 @@ msgstr "Cancella"
 msgid "Engine does not support debug level '%s'"
 msgstr "Il motore non supporta il livello di debug '%s'"
 
-#: base/main.cpp:271
+#: base/main.cpp:277
 msgid "Menu"
 msgstr "Menu"
 
-#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:280 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:277 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50
 #: backends/platform/wince/CEActionsPocket.cpp:42
 msgid "Pause"
 msgstr "Pausa"
 
-#: base/main.cpp:280
+#: base/main.cpp:286
 msgid "Skip line"
 msgstr "Salta battuta"
 
-#: base/main.cpp:439
+#: base/main.cpp:445
 msgid "Error running game:"
 msgstr "Errore nell'esecuzione del gioco:"
 
-#: base/main.cpp:463
+#: base/main.cpp:469
 msgid "Could not find any engine capable of running the selected game"
 msgstr ""
 "Impossibile trovare un motore in grado di eseguire il gioco selezionato"
@@ -1193,23 +1193,23 @@ msgstr "~A~nnulla"
 msgid "~K~eys"
 msgstr "~T~asti"
 
-#: engines/engine.cpp:233
+#: engines/engine.cpp:235
 msgid "Could not initialize color format."
 msgstr "Impossibile inizializzare il formato colore."
 
-#: engines/engine.cpp:241
+#: engines/engine.cpp:243
 msgid "Could not switch to video mode: '"
 msgstr "Impossibile cambiare la modalità video: '"
 
-#: engines/engine.cpp:250
+#: engines/engine.cpp:252
 msgid "Could not apply aspect ratio setting."
 msgstr "Impossibile applicare l'impostazione proporzioni"
 
-#: engines/engine.cpp:255
+#: engines/engine.cpp:257
 msgid "Could not apply fullscreen setting."
 msgstr "Impossibile applicare l'impostazione schermo intero."
 
-#: engines/engine.cpp:355
+#: engines/engine.cpp:357
 msgid ""
 "You appear to be playing this game directly\n"
 "from the CD. This is known to cause problems,\n"
@@ -1223,7 +1223,7 @@ msgstr ""
 "sull'hard disk.\n"
 "Vedi il file README per i dettagli."
 
-#: engines/engine.cpp:366
+#: engines/engine.cpp:368
 msgid ""
 "This game has audio tracks in its disk. These\n"
 "tracks need to be ripped from the disk using\n"
@@ -1237,7 +1237,7 @@ msgstr ""
 "la musica del gioco.\n"
 "Vedi il file README per i dettagli."
 
-#: engines/engine.cpp:433
+#: engines/engine.cpp:435
 msgid ""
 "WARNING: The game you are about to start is not yet fully supported by "
 "ScummVM. As such, it is likely to be unstable, and any saves you make might "
@@ -1247,7 +1247,7 @@ msgstr ""
 "ScummVM. È quindi possibile che sia instabile, e i salvataggi potrebbero non "
 "funzionare con future versioni di ScummVM."
 
-#: engines/engine.cpp:436
+#: engines/engine.cpp:438
 msgid "Start anyway"
 msgstr "Avvia comunque"
 
@@ -2008,56 +2008,56 @@ msgstr "Impossibile eliminare il file."
 msgid "Failed to save game"
 msgstr "Impossibile salvare il gioco"
 
-#: engines/kyra/lol.cpp:572
+#: engines/kyra/lol.cpp:478
 msgid "Attack 1"
 msgstr ""
 
-#: engines/kyra/lol.cpp:573
+#: engines/kyra/lol.cpp:479
 msgid "Attack 2"
 msgstr ""
 
-#: engines/kyra/lol.cpp:574
+#: engines/kyra/lol.cpp:480
 msgid "Attack 3"
 msgstr ""
 
-#: engines/kyra/lol.cpp:575
+#: engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr ""
 
-#: engines/kyra/lol.cpp:576
+#: engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr ""
 
-#: engines/kyra/lol.cpp:577
+#: engines/kyra/lol.cpp:483
 msgid "Slide Left"
 msgstr ""
 
-#: engines/kyra/lol.cpp:578
+#: engines/kyra/lol.cpp:484
 #, fuzzy
 msgid "Slide Right"
 msgstr "Destra"
 
-#: engines/kyra/lol.cpp:579
+#: engines/kyra/lol.cpp:485
 #, fuzzy
 msgid "Turn Left"
 msgstr "Spegni"
 
-#: engines/kyra/lol.cpp:580
+#: engines/kyra/lol.cpp:486
 #, fuzzy
 msgid "Turn Right"
 msgstr "Cursore a destra"
 
-#: engines/kyra/lol.cpp:581
+#: engines/kyra/lol.cpp:487
 #, fuzzy
 msgid "Rest"
 msgstr "Ripristina"
 
-#: engines/kyra/lol.cpp:582
+#: engines/kyra/lol.cpp:488
 #, fuzzy
 msgid "Options"
 msgstr "~O~pzioni"
 
-#: engines/kyra/lol.cpp:583
+#: engines/kyra/lol.cpp:489
 #, fuzzy
 msgid "Choose Spell"
 msgstr "Scegli"
@@ -2092,17 +2092,17 @@ msgstr ""
 "Il file \"sky.cpt\" non ha una dimensione corretta.\n"
 "Si prega di (ri)scaricarlo da www.scummvm.org"
 
-#: engines/sword1/animation.cpp:345 engines/sword2/animation.cpp:379
+#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379
 msgid "DXA cutscenes found but ScummVM has been built without zlib support"
 msgstr ""
 "Sono state trovare scene di intermezzo DXA ma ScummVM è stato compilato "
 "senza il supporto zlib"
 
-#: engines/sword1/animation.cpp:355 engines/sword2/animation.cpp:389
+#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389
 msgid "MPEG2 cutscenes are no longer supported"
 msgstr "Le scene di intermezzo MPEG2 non sono più supportate"
 
-#: engines/sword1/animation.cpp:360 engines/sword2/animation.cpp:397
+#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397
 #, c-format
 msgid "Cutscene '%s' not found"
 msgstr "Scena di intermezzo '%s' non trovata"
@@ -2389,24 +2389,24 @@ msgstr "Modalit
 msgid "Touchpad mode disabled."
 msgstr "Modalità touchpad disattivata."
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:67
+#: backends/platform/sdl/macosx/appmenu_osx.mm:78
 msgid "Hide ScummVM"
 msgstr "Nascondi ScummVM"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: backends/platform/sdl/macosx/appmenu_osx.mm:83
 msgid "Hide Others"
 msgstr "Nascondi altri"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:74
+#: backends/platform/sdl/macosx/appmenu_osx.mm:88
 msgid "Show All"
 msgstr "Mostra tutti"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:92
-#: backends/platform/sdl/macosx/appmenu_osx.mm:99
+#: backends/platform/sdl/macosx/appmenu_osx.mm:110
+#: backends/platform/sdl/macosx/appmenu_osx.mm:121
 msgid "Window"
 msgstr "Finestra"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:95
+#: backends/platform/sdl/macosx/appmenu_osx.mm:115
 msgid "Minimize"
 msgstr "Minimizza"
 
diff --git a/po/module.mk b/po/module.mk
index ef3e058..a929565 100644
--- a/po/module.mk
+++ b/po/module.mk
@@ -1,5 +1,6 @@
 POTFILE := $(srcdir)/po/scummvm.pot
 POFILES := $(wildcard $(srcdir)/po/*.po)
+CPFILES := $(wildcard $(srcdir)/po/*.cp)
 
 updatepot:
 	xgettext -f $(srcdir)/po/POTFILES -D $(srcdir) -d scummvm --c++ -k_ -k_s -k_c:1,2c -k_sc:1,2c --add-comments=I18N\
@@ -34,12 +35,12 @@ updatepot:
 	fi;
 
 translations-dat: devtools/create_translations
-	devtools/create_translations/create_translations $(POFILES)
+	devtools/create_translations/create_translations $(POFILES) $(CPFILES)
 	mv translations.dat $(srcdir)/gui/themes/
 
-update-translations: updatepot $(POFILES) translations-dat
+update-translations: updatepot $(POFILES) $(CPFILES) translations-dat
 
-update-translations: updatepot $(POFILES)
+update-translations: updatepot $(POFILES) $(CPFILES)
 	@$(foreach file, $(POFILES), echo -n $(notdir $(basename $(file)))": ";msgfmt --statistic $(file);)
 	@rm -f messages.mo
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 7675ca2..981c5b0 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2010-2012 ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Einar Johan T. Sømåen <einarjohants at gmail.com>, 2010.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.3.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2011-12-26 15:26+0100\n"
+"POT-Creation-Date: 2012-01-28 21:48+0100\n"
 "PO-Revision-Date: 2011-04-25 22:56+0100\n"
 "Last-Translator: Einar Johan T. Sømåen <einarjohants at gmail.com>\n"
 "Language-Team: somaen <einarjohants at gmail.com>\n"
@@ -49,7 +49,7 @@ msgstr "G
 #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
 #: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221
 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
-#: engines/engine.cpp:436 engines/scumm/dialogs.cpp:190
+#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190
 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
 #: backends/platform/wii/options.cpp:48
 #: backends/events/default/default-events.cpp:222
@@ -61,22 +61,22 @@ msgstr "Avbryt"
 msgid "Choose"
 msgstr "Velg"
 
-#: gui/gui-manager.cpp:116 engines/scumm/help.cpp:125
+#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125
 #: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165
 #: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209
 #: backends/keymapper/remap-dialog.cpp:52
 msgid "Close"
 msgstr "Lukk"
 
-#: gui/gui-manager.cpp:119
+#: gui/gui-manager.cpp:118
 msgid "Mouse click"
 msgstr "Musklikk"
 
-#: gui/gui-manager.cpp:122 base/main.cpp:283
+#: gui/gui-manager.cpp:121 base/main.cpp:289
 msgid "Display keyboard"
 msgstr "Vis tastatur"
 
-#: gui/gui-manager.cpp:125 base/main.cpp:286
+#: gui/gui-manager.cpp:124 base/main.cpp:292
 msgid "Remap keys"
 msgstr "Omkoble taster"
 
@@ -90,11 +90,11 @@ msgstr "Koble"
 
 #: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959
 #: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222
-#: engines/engine.cpp:359 engines/engine.cpp:370 engines/scumm/dialogs.cpp:192
+#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
 #: engines/scumm/scumm.cpp:1784 engines/agos/animation.cpp:551
 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
-#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:345
-#: engines/sword1/animation.cpp:355 engines/sword1/animation.cpp:361
+#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449
+#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465
 #: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633
 #: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389
 #: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281
@@ -349,7 +349,7 @@ msgstr "Denne spill-IDen er allerede i bruk. Vennligst velg en annen."
 msgid "~Q~uit"
 msgstr "~A~vslutt"
 
-#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:80
+#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96
 msgid "Quit ScummVM"
 msgstr "Avslutt ScummVM"
 
@@ -357,7 +357,7 @@ msgstr "Avslutt ScummVM"
 msgid "A~b~out..."
 msgstr "~O~m..."
 
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:61
+#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70
 msgid "About ScummVM"
 msgstr "Om ScummVM"
 
@@ -960,28 +960,28 @@ msgstr "Ikke navngitt spilltilstand"
 msgid "Select a Theme"
 msgstr "Velg et tema"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgid "Disabled GFX"
 msgstr "Deaktivert GFX"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgctxt "lowres"
 msgid "Disabled GFX"
 msgstr "Deaktivert GFX"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard Renderer (16bpp)"
 msgstr "Standard Tegner (16bpp)"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard (16bpp)"
 msgstr "Standard (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased Renderer (16bpp)"
 msgstr "Antialiased Tegner (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased (16bpp)"
 msgstr "Antialiased (16bpp)"
 
@@ -994,30 +994,30 @@ msgstr "T
 msgid "Engine does not support debug level '%s'"
 msgstr "Motoren støtter ikke debug-nivå '%s'"
 
-#: base/main.cpp:271
+#: base/main.cpp:277
 msgid "Menu"
 msgstr "Meny"
 
-#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:280 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:277 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50
 #: backends/platform/wince/CEActionsPocket.cpp:42
 msgid "Pause"
 msgstr "Pause"
 
-#: base/main.cpp:280
+#: base/main.cpp:286
 msgid "Skip line"
 msgstr "Hopp over linje"
 
-#: base/main.cpp:439
+#: base/main.cpp:445
 msgid "Error running game:"
 msgstr "Problem ved kjøring av spill:"
 
-#: base/main.cpp:463
+#: base/main.cpp:469
 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"
 
@@ -1186,25 +1186,25 @@ msgstr "~A~vbryt"
 msgid "~K~eys"
 msgstr "~T~aster"
 
-#: engines/engine.cpp:233
+#: engines/engine.cpp:235
 msgid "Could not initialize color format."
 msgstr ""
 
-#: engines/engine.cpp:241
+#: engines/engine.cpp:243
 #, fuzzy
 msgid "Could not switch to video mode: '"
 msgstr "Nåværende videomodus:"
 
-#: engines/engine.cpp:250
+#: engines/engine.cpp:252
 #, fuzzy
 msgid "Could not apply aspect ratio setting."
 msgstr "Veksle aspekt-rate korrigering"
 
-#: engines/engine.cpp:255
+#: engines/engine.cpp:257
 msgid "Could not apply fullscreen setting."
 msgstr ""
 
-#: engines/engine.cpp:355
+#: engines/engine.cpp:357
 msgid ""
 "You appear to be playing this game directly\n"
 "from the CD. This is known to cause problems,\n"
@@ -1213,7 +1213,7 @@ msgid ""
 "See the README file for details."
 msgstr ""
 
-#: engines/engine.cpp:366
+#: engines/engine.cpp:368
 msgid ""
 "This game has audio tracks in its disk. These\n"
 "tracks need to be ripped from the disk using\n"
@@ -1222,14 +1222,14 @@ msgid ""
 "See the README file for details."
 msgstr ""
 
-#: engines/engine.cpp:433
+#: engines/engine.cpp:435
 msgid ""
 "WARNING: The game you are about to start is not yet fully supported by "
 "ScummVM. As such, it is likely to be unstable, and any saves you make might "
 "not work in future versions of ScummVM."
 msgstr ""
 
-#: engines/engine.cpp:436
+#: engines/engine.cpp:438
 msgid "Start anyway"
 msgstr ""
 
@@ -2012,56 +2012,56 @@ msgstr ""
 "\n"
 "%s"
 
-#: engines/kyra/lol.cpp:572
+#: engines/kyra/lol.cpp:478
 msgid "Attack 1"
 msgstr ""
 
-#: engines/kyra/lol.cpp:573
+#: engines/kyra/lol.cpp:479
 msgid "Attack 2"
 msgstr ""
 
-#: engines/kyra/lol.cpp:574
+#: engines/kyra/lol.cpp:480
 msgid "Attack 3"
 msgstr ""
 
-#: engines/kyra/lol.cpp:575
+#: engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr ""
 
-#: engines/kyra/lol.cpp:576
+#: engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr ""
 
-#: engines/kyra/lol.cpp:577
+#: engines/kyra/lol.cpp:483
 msgid "Slide Left"
 msgstr ""
 
-#: engines/kyra/lol.cpp:578
+#: engines/kyra/lol.cpp:484
 #, fuzzy
 msgid "Slide Right"
 msgstr "Høyre"
 
-#: engines/kyra/lol.cpp:579
+#: engines/kyra/lol.cpp:485
 #, fuzzy
 msgid "Turn Left"
 msgstr "Slå av"
 
-#: engines/kyra/lol.cpp:580
+#: engines/kyra/lol.cpp:486
 #, fuzzy
 msgid "Turn Right"
 msgstr "Peker høyre"
 
-#: engines/kyra/lol.cpp:581
+#: engines/kyra/lol.cpp:487
 #, fuzzy
 msgid "Rest"
 msgstr "Gjenopprett"
 
-#: engines/kyra/lol.cpp:582
+#: engines/kyra/lol.cpp:488
 #, fuzzy
 msgid "Options"
 msgstr "~V~alg"
 
-#: engines/kyra/lol.cpp:583
+#: engines/kyra/lol.cpp:489
 #, fuzzy
 msgid "Choose Spell"
 msgstr "Velg"
@@ -2087,15 +2087,15 @@ msgid ""
 "Please (re)download it from www.scummvm.org"
 msgstr ""
 
-#: engines/sword1/animation.cpp:345 engines/sword2/animation.cpp:379
+#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379
 msgid "DXA cutscenes found but ScummVM has been built without zlib support"
 msgstr ""
 
-#: engines/sword1/animation.cpp:355 engines/sword2/animation.cpp:389
+#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389
 msgid "MPEG2 cutscenes are no longer supported"
 msgstr ""
 
-#: engines/sword1/animation.cpp:360 engines/sword2/animation.cpp:397
+#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397
 #, c-format
 msgid "Cutscene '%s' not found"
 msgstr ""
@@ -2357,26 +2357,26 @@ msgstr "Touchpad-modus aktivert."
 msgid "Touchpad mode disabled."
 msgstr "Touchpad-modus deaktivert."
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:67
+#: backends/platform/sdl/macosx/appmenu_osx.mm:78
 #, fuzzy
 msgid "Hide ScummVM"
 msgstr "Avslutt ScummVM"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: backends/platform/sdl/macosx/appmenu_osx.mm:83
 msgid "Hide Others"
 msgstr ""
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:74
+#: backends/platform/sdl/macosx/appmenu_osx.mm:88
 msgid "Show All"
 msgstr ""
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:92
-#: backends/platform/sdl/macosx/appmenu_osx.mm:99
+#: backends/platform/sdl/macosx/appmenu_osx.mm:110
+#: backends/platform/sdl/macosx/appmenu_osx.mm:121
 #, fuzzy
 msgid "Window"
 msgstr "Windows MIDI"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:95
+#: backends/platform/sdl/macosx/appmenu_osx.mm:115
 msgid "Minimize"
 msgstr ""
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 613e01e..feec7ab 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2010-2012 ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Einar Johan T. Sømåen <einarjohants at gmail.com>, 2010.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.3.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2011-12-26 15:26+0100\n"
+"POT-Creation-Date: 2012-01-28 21:48+0100\n"
 "PO-Revision-Date: 2011-04-25 23:07+0100\n"
 "Last-Translator: Einar Johan T. Sømåen <einarjohants at gmail.com>\n"
 "Language-Team: somaen <einarjohants at gmail.com>\n"
@@ -49,7 +49,7 @@ msgstr "G
 #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
 #: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221
 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
-#: engines/engine.cpp:436 engines/scumm/dialogs.cpp:190
+#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190
 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
 #: backends/platform/wii/options.cpp:48
 #: backends/events/default/default-events.cpp:222
@@ -61,22 +61,22 @@ msgstr "Avbryt"
 msgid "Choose"
 msgstr "Vel"
 
-#: gui/gui-manager.cpp:116 engines/scumm/help.cpp:125
+#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125
 #: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165
 #: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209
 #: backends/keymapper/remap-dialog.cpp:52
 msgid "Close"
 msgstr "Steng"
 
-#: gui/gui-manager.cpp:119
+#: gui/gui-manager.cpp:118
 msgid "Mouse click"
 msgstr "Musklikk"
 
-#: gui/gui-manager.cpp:122 base/main.cpp:283
+#: gui/gui-manager.cpp:121 base/main.cpp:289
 msgid "Display keyboard"
 msgstr "Syn Tastatur"
 
-#: gui/gui-manager.cpp:125 base/main.cpp:286
+#: gui/gui-manager.cpp:124 base/main.cpp:292
 msgid "Remap keys"
 msgstr "Omkople tastar"
 
@@ -90,11 +90,11 @@ msgstr "Kople"
 
 #: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959
 #: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222
-#: engines/engine.cpp:359 engines/engine.cpp:370 engines/scumm/dialogs.cpp:192
+#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
 #: engines/scumm/scumm.cpp:1784 engines/agos/animation.cpp:551
 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
-#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:345
-#: engines/sword1/animation.cpp:355 engines/sword1/animation.cpp:361
+#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449
+#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465
 #: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633
 #: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389
 #: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281
@@ -349,7 +349,7 @@ msgstr ""
 msgid "~Q~uit"
 msgstr "~A~vslutt"
 
-#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:80
+#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96
 msgid "Quit ScummVM"
 msgstr "Avslutt ScummVM"
 
@@ -357,7 +357,7 @@ msgstr "Avslutt ScummVM"
 msgid "A~b~out..."
 msgstr "~O~m..."
 
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:61
+#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70
 msgid "About ScummVM"
 msgstr "Om ScummVM"
 
@@ -957,28 +957,28 @@ msgstr "Ikkje navngjeven speltilstand"
 msgid "Select a Theme"
 msgstr "Vel eit tema"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgid "Disabled GFX"
 msgstr "Deaktivert GFX"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgctxt "lowres"
 msgid "Disabled GFX"
 msgstr "Deaktivert GFX"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard Renderer (16bpp)"
 msgstr "Standard Teiknar (16bpp)"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard (16bpp)"
 msgstr "Standard (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased Renderer (16bpp)"
 msgstr "Antialiased Teiknar (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased (16bpp)"
 msgstr "Antialiased (16bpp)"
 
@@ -991,30 +991,30 @@ msgstr "T
 msgid "Engine does not support debug level '%s'"
 msgstr "Motoren støttar ikkje debug-nivå '%s'"
 
-#: base/main.cpp:271
+#: base/main.cpp:277
 msgid "Menu"
 msgstr "Meny"
 
-#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:280 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:277 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50
 #: backends/platform/wince/CEActionsPocket.cpp:42
 msgid "Pause"
 msgstr "Pause"
 
-#: base/main.cpp:280
+#: base/main.cpp:286
 msgid "Skip line"
 msgstr "Hopp over linje"
 
-#: base/main.cpp:439
+#: base/main.cpp:445
 msgid "Error running game:"
 msgstr "Feil under køyring av spel:"
 
-#: base/main.cpp:463
+#: base/main.cpp:469
 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."
 
@@ -1186,25 +1186,25 @@ msgstr "~A~vbryt"
 msgid "~K~eys"
 msgstr "~T~astar"
 
-#: engines/engine.cpp:233
+#: engines/engine.cpp:235
 msgid "Could not initialize color format."
 msgstr ""
 
-#: engines/engine.cpp:241
+#: engines/engine.cpp:243
 #, fuzzy
 msgid "Could not switch to video mode: '"
 msgstr "Gjeldende videomodus:"
 
-#: engines/engine.cpp:250
+#: engines/engine.cpp:252
 #, fuzzy
 msgid "Could not apply aspect ratio setting."
 msgstr "Veksle aspekt-korrigering"
 
-#: engines/engine.cpp:255
+#: engines/engine.cpp:257
 msgid "Could not apply fullscreen setting."
 msgstr ""
 
-#: engines/engine.cpp:355
+#: engines/engine.cpp:357
 msgid ""
 "You appear to be playing this game directly\n"
 "from the CD. This is known to cause problems,\n"
@@ -1213,7 +1213,7 @@ msgid ""
 "See the README file for details."
 msgstr ""
 
-#: engines/engine.cpp:366
+#: engines/engine.cpp:368
 msgid ""
 "This game has audio tracks in its disk. These\n"
 "tracks need to be ripped from the disk using\n"
@@ -1222,14 +1222,14 @@ msgid ""
 "See the README file for details."
 msgstr ""
 
-#: engines/engine.cpp:433
+#: engines/engine.cpp:435
 msgid ""
 "WARNING: The game you are about to start is not yet fully supported by "
 "ScummVM. As such, it is likely to be unstable, and any saves you make might "
 "not work in future versions of ScummVM."
 msgstr ""
 
-#: engines/engine.cpp:436
+#: engines/engine.cpp:438
 msgid "Start anyway"
 msgstr ""
 
@@ -1988,56 +1988,56 @@ msgstr ""
 msgid "Failed to save game"
 msgstr "Full speltittel:"
 
-#: engines/kyra/lol.cpp:572
+#: engines/kyra/lol.cpp:478
 msgid "Attack 1"
 msgstr ""
 
-#: engines/kyra/lol.cpp:573
+#: engines/kyra/lol.cpp:479
 msgid "Attack 2"
 msgstr ""
 
-#: engines/kyra/lol.cpp:574
+#: engines/kyra/lol.cpp:480
 msgid "Attack 3"
 msgstr ""
 
-#: engines/kyra/lol.cpp:575
+#: engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr ""
 
-#: engines/kyra/lol.cpp:576
+#: engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr ""
 
-#: engines/kyra/lol.cpp:577
+#: engines/kyra/lol.cpp:483
 msgid "Slide Left"
 msgstr ""
 
-#: engines/kyra/lol.cpp:578
+#: engines/kyra/lol.cpp:484
 #, fuzzy
 msgid "Slide Right"
 msgstr "Høgre"
 
-#: engines/kyra/lol.cpp:579
+#: engines/kyra/lol.cpp:485
 #, fuzzy
 msgid "Turn Left"
 msgstr "Slå av"
 
-#: engines/kyra/lol.cpp:580
+#: engines/kyra/lol.cpp:486
 #, fuzzy
 msgid "Turn Right"
 msgstr "Peikar høgre"
 
-#: engines/kyra/lol.cpp:581
+#: engines/kyra/lol.cpp:487
 #, fuzzy
 msgid "Rest"
 msgstr "Gjenopprett"
 
-#: engines/kyra/lol.cpp:582
+#: engines/kyra/lol.cpp:488
 #, fuzzy
 msgid "Options"
 msgstr "~V~al"
 
-#: engines/kyra/lol.cpp:583
+#: engines/kyra/lol.cpp:489
 #, fuzzy
 msgid "Choose Spell"
 msgstr "Vel"
@@ -2063,15 +2063,15 @@ msgid ""
 "Please (re)download it from www.scummvm.org"
 msgstr ""
 
-#: engines/sword1/animation.cpp:345 engines/sword2/animation.cpp:379
+#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379
 msgid "DXA cutscenes found but ScummVM has been built without zlib support"
 msgstr ""
 
-#: engines/sword1/animation.cpp:355 engines/sword2/animation.cpp:389
+#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389
 msgid "MPEG2 cutscenes are no longer supported"
 msgstr ""
 
-#: engines/sword1/animation.cpp:360 engines/sword2/animation.cpp:397
+#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397
 #, c-format
 msgid "Cutscene '%s' not found"
 msgstr ""
@@ -2331,26 +2331,26 @@ msgstr ""
 msgid "Touchpad mode disabled."
 msgstr ""
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:67
+#: backends/platform/sdl/macosx/appmenu_osx.mm:78
 #, fuzzy
 msgid "Hide ScummVM"
 msgstr "Avslutt ScummVM"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: backends/platform/sdl/macosx/appmenu_osx.mm:83
 msgid "Hide Others"
 msgstr ""
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:74
+#: backends/platform/sdl/macosx/appmenu_osx.mm:88
 msgid "Show All"
 msgstr ""
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:92
-#: backends/platform/sdl/macosx/appmenu_osx.mm:99
+#: backends/platform/sdl/macosx/appmenu_osx.mm:110
+#: backends/platform/sdl/macosx/appmenu_osx.mm:121
 #, fuzzy
 msgid "Window"
 msgstr "Windows MIDI"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:95
+#: backends/platform/sdl/macosx/appmenu_osx.mm:115
 msgid "Minimize"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index dc6dbb3..ac5da14 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 at lists.sf.net\n"
-"POT-Creation-Date: 2011-12-26 15:26+0100\n"
+"POT-Creation-Date: 2012-01-28 21:48+0100\n"
 "PO-Revision-Date: 2011-10-24 21:14+0100\n"
 "Last-Translator: Micha³ Zi±bkowski <mziab at o2.pl>\n"
 "Language-Team: Grajpopolsku.pl <grajpopolsku at gmail.com>\n"
@@ -49,7 +49,7 @@ msgstr "W g
 #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
 #: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221
 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
-#: engines/engine.cpp:436 engines/scumm/dialogs.cpp:190
+#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190
 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
 #: backends/platform/wii/options.cpp:48
 #: backends/events/default/default-events.cpp:222
@@ -61,22 +61,22 @@ msgstr "Anuluj"
 msgid "Choose"
 msgstr "Wybierz"
 
-#: gui/gui-manager.cpp:116 engines/scumm/help.cpp:125
+#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125
 #: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165
 #: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209
 #: backends/keymapper/remap-dialog.cpp:52
 msgid "Close"
 msgstr "Zamknij"
 
-#: gui/gui-manager.cpp:119
+#: gui/gui-manager.cpp:118
 msgid "Mouse click"
 msgstr "Klikniêcie"
 
-#: gui/gui-manager.cpp:122 base/main.cpp:283
+#: gui/gui-manager.cpp:121 base/main.cpp:289
 msgid "Display keyboard"
 msgstr "Wy¶wietl klawiaturê"
 
-#: gui/gui-manager.cpp:125 base/main.cpp:286
+#: gui/gui-manager.cpp:124 base/main.cpp:292
 msgid "Remap keys"
 msgstr "Dostosuj klawisze"
 
@@ -90,11 +90,11 @@ msgstr "Przypisz"
 
 #: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959
 #: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222
-#: engines/engine.cpp:359 engines/engine.cpp:370 engines/scumm/dialogs.cpp:192
+#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
 #: engines/scumm/scumm.cpp:1784 engines/agos/animation.cpp:551
 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
-#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:345
-#: engines/sword1/animation.cpp:355 engines/sword1/animation.cpp:361
+#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449
+#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465
 #: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633
 #: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389
 #: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281
@@ -347,7 +347,7 @@ msgstr "Identyfikator jest ju
 msgid "~Q~uit"
 msgstr "~Z~akoñcz"
 
-#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:80
+#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96
 msgid "Quit ScummVM"
 msgstr "Zakoñcz ScummVM"
 
@@ -355,7 +355,7 @@ msgstr "Zako
 msgid "A~b~out..."
 msgstr "I~n~formacje..."
 
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:61
+#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70
 msgid "About ScummVM"
 msgstr "O ScummVM"
 
@@ -959,28 +959,28 @@ msgstr "Zapis bez nazwy"
 msgid "Select a Theme"
 msgstr "Wybierz styl"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgid "Disabled GFX"
 msgstr "Wy³±czona grafika"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgctxt "lowres"
 msgid "Disabled GFX"
 msgstr "Wy³±czona grafika"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard Renderer (16bpp)"
 msgstr "Standardowy renderer (16bpp)"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard (16bpp)"
 msgstr "Standardowy (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased Renderer (16bpp)"
 msgstr "Wyg³adzany renderer (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased (16bpp)"
 msgstr "Wyg³adzany (16bpp)"
 
@@ -993,30 +993,30 @@ msgstr "Wyczy
 msgid "Engine does not support debug level '%s'"
 msgstr "Silnik nie wspiera poziomu debugowania '%s'"
 
-#: base/main.cpp:271
+#: base/main.cpp:277
 msgid "Menu"
 msgstr "Menu"
 
-#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:280 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:277 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50
 #: backends/platform/wince/CEActionsPocket.cpp:42
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#: base/main.cpp:280
+#: base/main.cpp:286
 msgid "Skip line"
 msgstr "Pomiñ liniê"
 
-#: base/main.cpp:439
+#: base/main.cpp:445
 msgid "Error running game:"
 msgstr "B³±d podczas uruchamiania gry:"
 
-#: base/main.cpp:463
+#: base/main.cpp:469
 msgid "Could not find any engine capable of running the selected game"
 msgstr "Nie uda³o siê znale¼æ silnika zdolnego do uruchomienia zaznaczonej gry"
 
@@ -1188,23 +1188,23 @@ msgstr "~A~nuluj"
 msgid "~K~eys"
 msgstr "~K~lawisze"
 
-#: engines/engine.cpp:233
+#: engines/engine.cpp:235
 msgid "Could not initialize color format."
 msgstr "Nie uda³o siê zainicjalizowaæ formatu kolorów."
 
-#: engines/engine.cpp:241
+#: engines/engine.cpp:243
 msgid "Could not switch to video mode: '"
 msgstr "Nie uda³o siê prze³±czyæ w tryb wideo: '"
 
-#: engines/engine.cpp:250
+#: engines/engine.cpp:252
 msgid "Could not apply aspect ratio setting."
 msgstr "Nie uda³o siê zastosowaæ ustawienia formatu obrazu."
 
-#: engines/engine.cpp:255
+#: engines/engine.cpp:257
 msgid "Could not apply fullscreen setting."
 msgstr "Nie uda³o siê zastosowaæ ustawienia pe³nego ekranu."
 
-#: engines/engine.cpp:355
+#: engines/engine.cpp:357
 msgid ""
 "You appear to be playing this game directly\n"
 "from the CD. This is known to cause problems,\n"
@@ -1216,7 +1216,7 @@ msgstr ""
 "znane problemów. St±d zalecane jest skopiowanie plików gry na twardy dysk.\n"
 "Dalsze informacje s± dostêpne w pliku README."
 
-#: engines/engine.cpp:366
+#: engines/engine.cpp:368
 msgid ""
 "This game has audio tracks in its disk. These\n"
 "tracks need to be ripped from the disk using\n"
@@ -1228,7 +1228,7 @@ msgstr ""
 "skopiowaæ na dysk za pomoc± odpowiedniego rippera CD audio.\n"
 "Dalsze informacje s± dostêpne w pliku README."
 
-#: engines/engine.cpp:433
+#: engines/engine.cpp:435
 msgid ""
 "WARNING: The game you are about to start is not yet fully supported by "
 "ScummVM. As such, it is likely to be unstable, and any saves you make might "
@@ -1238,7 +1238,7 @@ msgstr ""
 "ScummVM. W zwi±zku z tym mo¿e byæ ona niestabilna, a wszelkie zapisy, "
 "których dokonasz, mog± byæ nieobs³ugiwane w przysz³ych wersjach ScummVM."
 
-#: engines/engine.cpp:436
+#: engines/engine.cpp:438
 msgid "Start anyway"
 msgstr "W³±cz mimo tego"
 
@@ -1998,56 +1998,56 @@ msgstr "Nie uda
 msgid "Failed to save game"
 msgstr "Nie uda³o siê zapisaæ stanu gry"
 
-#: engines/kyra/lol.cpp:572
+#: engines/kyra/lol.cpp:478
 msgid "Attack 1"
 msgstr ""
 
-#: engines/kyra/lol.cpp:573
+#: engines/kyra/lol.cpp:479
 msgid "Attack 2"
 msgstr ""
 
-#: engines/kyra/lol.cpp:574
+#: engines/kyra/lol.cpp:480
 msgid "Attack 3"
 msgstr ""
 
-#: engines/kyra/lol.cpp:575
+#: engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr ""
 
-#: engines/kyra/lol.cpp:576
+#: engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr ""
 
-#: engines/kyra/lol.cpp:577
+#: engines/kyra/lol.cpp:483
 msgid "Slide Left"
 msgstr ""
 
-#: engines/kyra/lol.cpp:578
+#: engines/kyra/lol.cpp:484
 #, fuzzy
 msgid "Slide Right"
 msgstr "W prawo"
 
-#: engines/kyra/lol.cpp:579
+#: engines/kyra/lol.cpp:485
 #, fuzzy
 msgid "Turn Left"
 msgstr "Wy³±cz"
 
-#: engines/kyra/lol.cpp:580
+#: engines/kyra/lol.cpp:486
 #, fuzzy
 msgid "Turn Right"
 msgstr "Kursor w prawo"
 
-#: engines/kyra/lol.cpp:581
+#: engines/kyra/lol.cpp:487
 #, fuzzy
 msgid "Rest"
 msgstr "Wznów"
 
-#: engines/kyra/lol.cpp:582
+#: engines/kyra/lol.cpp:488
 #, fuzzy
 msgid "Options"
 msgstr "~O~pcje"
 
-#: engines/kyra/lol.cpp:583
+#: engines/kyra/lol.cpp:489
 #, fuzzy
 msgid "Choose Spell"
 msgstr "Wybierz"
@@ -2081,17 +2081,17 @@ msgstr ""
 "Plik \"sky.cpt\" ma nieprawid³owy rozmiar.\n"
 "Pobierz go (ponownie) ze strony www.scummvm.org"
 
-#: engines/sword1/animation.cpp:345 engines/sword2/animation.cpp:379
+#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379
 msgid "DXA cutscenes found but ScummVM has been built without zlib support"
 msgstr ""
 "Znaleziono przerywniki w formacie DXA, ale ScummVM jest skompilowany bez "
 "obs³ugi zlib"
 
-#: engines/sword1/animation.cpp:355 engines/sword2/animation.cpp:389
+#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389
 msgid "MPEG2 cutscenes are no longer supported"
 msgstr "Przerywniki w formacie MPEG2 nie s± ju¿ obs³ugiwane"
 
-#: engines/sword1/animation.cpp:360 engines/sword2/animation.cpp:397
+#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397
 #, c-format
 msgid "Cutscene '%s' not found"
 msgstr "Nie znaleziono przerywnika '%s'"
@@ -2377,24 +2377,24 @@ msgstr "Tryb touchpada w
 msgid "Touchpad mode disabled."
 msgstr "Tryb touchpada wy³±czony."
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:67
+#: backends/platform/sdl/macosx/appmenu_osx.mm:78
 msgid "Hide ScummVM"
 msgstr "Schowaj ScummVM"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: backends/platform/sdl/macosx/appmenu_osx.mm:83
 msgid "Hide Others"
 msgstr "Schowaj pozosta³e"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:74
+#: backends/platform/sdl/macosx/appmenu_osx.mm:88
 msgid "Show All"
 msgstr "Poka¿ wszystkie"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:92
-#: backends/platform/sdl/macosx/appmenu_osx.mm:99
+#: backends/platform/sdl/macosx/appmenu_osx.mm:110
+#: backends/platform/sdl/macosx/appmenu_osx.mm:121
 msgid "Window"
 msgstr "Okno"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:95
+#: backends/platform/sdl/macosx/appmenu_osx.mm:115
 msgid "Minimize"
 msgstr "Minimalizuj"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 46eed0c..860bc55 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 at lists.sf.net\n"
-"POT-Creation-Date: 2011-12-26 15:26+0100\n"
+"POT-Creation-Date: 2012-01-28 21:48+0100\n"
 "PO-Revision-Date: 2011-10-21 21:30-0300\n"
 "Last-Translator: Saulo Benigno <saulobenigno at gmail.com>\n"
 "Language-Team: ScummBR (www.scummbr.com) <scummbr at yahoo.com.br>\n"
@@ -49,7 +49,7 @@ msgstr "Acima"
 #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
 #: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221
 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
-#: engines/engine.cpp:436 engines/scumm/dialogs.cpp:190
+#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190
 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
 #: backends/platform/wii/options.cpp:48
 #: backends/events/default/default-events.cpp:222
@@ -61,22 +61,22 @@ msgstr "Cancelar"
 msgid "Choose"
 msgstr "Escolher"
 
-#: gui/gui-manager.cpp:116 engines/scumm/help.cpp:125
+#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125
 #: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165
 #: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209
 #: backends/keymapper/remap-dialog.cpp:52
 msgid "Close"
 msgstr "Fechar"
 
-#: gui/gui-manager.cpp:119
+#: gui/gui-manager.cpp:118
 msgid "Mouse click"
 msgstr "Clique do mouse"
 
-#: gui/gui-manager.cpp:122 base/main.cpp:283
+#: gui/gui-manager.cpp:121 base/main.cpp:289
 msgid "Display keyboard"
 msgstr "Mostrar teclado"
 
-#: gui/gui-manager.cpp:125 base/main.cpp:286
+#: gui/gui-manager.cpp:124 base/main.cpp:292
 msgid "Remap keys"
 msgstr "Remapear teclas"
 
@@ -90,11 +90,11 @@ msgstr "Mapear"
 
 #: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959
 #: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222
-#: engines/engine.cpp:359 engines/engine.cpp:370 engines/scumm/dialogs.cpp:192
+#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
 #: engines/scumm/scumm.cpp:1784 engines/agos/animation.cpp:551
 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
-#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:345
-#: engines/sword1/animation.cpp:355 engines/sword1/animation.cpp:361
+#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449
+#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465
 #: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633
 #: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389
 #: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281
@@ -347,7 +347,7 @@ msgstr "Este c
 msgid "~Q~uit"
 msgstr "~S~air"
 
-#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:80
+#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96
 msgid "Quit ScummVM"
 msgstr "Sair do ScummVM"
 
@@ -355,7 +355,7 @@ msgstr "Sair do ScummVM"
 msgid "A~b~out..."
 msgstr "So~b~re..."
 
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:61
+#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70
 msgid "About ScummVM"
 msgstr "Sobre o ScumnmVM"
 
@@ -968,28 +968,28 @@ msgstr "N
 msgid "Select a Theme"
 msgstr "Selecione um Tema"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgid "Disabled GFX"
 msgstr "GFX desabilitado"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgctxt "lowres"
 msgid "Disabled GFX"
 msgstr "GFX desabilitado"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard Renderer (16bpp)"
 msgstr "Renderizador padrão (16bpp)"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard (16bpp)"
 msgstr "Padrão (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased Renderer (16bpp)"
 msgstr "Renderizador Anti-Serrilhamento (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased (16bpp)"
 msgstr "Anti-Serrilhamento (16bpp)"
 
@@ -1002,30 +1002,30 @@ msgstr "Limpar valor"
 msgid "Engine does not support debug level '%s'"
 msgstr "Esse programa não suporta o nível de debug '%s'"
 
-#: base/main.cpp:271
+#: base/main.cpp:277
 msgid "Menu"
 msgstr "Menu"
 
-#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:280 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:277 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50
 #: backends/platform/wince/CEActionsPocket.cpp:42
 msgid "Pause"
 msgstr "Pausar"
 
-#: base/main.cpp:280
+#: base/main.cpp:286
 msgid "Skip line"
 msgstr "Pula linha"
 
-#: base/main.cpp:439
+#: base/main.cpp:445
 msgid "Error running game:"
 msgstr "Erro ao executar o jogo:"
 
-#: base/main.cpp:463
+#: base/main.cpp:469
 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 "
@@ -1200,23 +1200,23 @@ msgstr "~C~ancelar"
 msgid "~K~eys"
 msgstr "~T~eclas"
 
-#: engines/engine.cpp:233
+#: engines/engine.cpp:235
 msgid "Could not initialize color format."
 msgstr "Não foi possível inicializar o formato de cor."
 
-#: engines/engine.cpp:241
+#: engines/engine.cpp:243
 msgid "Could not switch to video mode: '"
 msgstr "Não foi possível alternar o modo de vídeo atual:"
 
-#: engines/engine.cpp:250
+#: engines/engine.cpp:252
 msgid "Could not apply aspect ratio setting."
 msgstr "Não foi possível aplicar a correção de proporção"
 
-#: engines/engine.cpp:255
+#: engines/engine.cpp:257
 msgid "Could not apply fullscreen setting."
 msgstr "Não foi possível aplicar a configuração de tela cheia."
 
-#: engines/engine.cpp:355
+#: engines/engine.cpp:357
 msgid ""
 "You appear to be playing this game directly\n"
 "from the CD. This is known to cause problems,\n"
@@ -1230,7 +1230,7 @@ msgstr ""
 "os arquivos de dados para o disco rígido.\n"
 "Consulte o arquivo README para mais detalhes."
 
-#: engines/engine.cpp:366
+#: engines/engine.cpp:368
 msgid ""
 "This game has audio tracks in its disk. These\n"
 "tracks need to be ripped from the disk using\n"
@@ -1244,7 +1244,7 @@ msgstr ""
 "para ouvir a música do jogo.\n"
 "Consulte o arquivo README para mais detalhes."
 
-#: engines/engine.cpp:433
+#: engines/engine.cpp:435
 msgid ""
 "WARNING: The game you are about to start is not yet fully supported by "
 "ScummVM. As such, it is likely to be unstable, and any saves you make might "
@@ -1254,7 +1254,7 @@ msgstr ""
 "suportado pelo ScummVM. Como tal, é provável que seja instável, e qualquer "
 "jogo salvo que você fizer pode não funcionar em futuras versões do ScummVM."
 
-#: engines/engine.cpp:436
+#: engines/engine.cpp:438
 msgid "Start anyway"
 msgstr "Iniciar de qualquer maneira"
 
@@ -2022,56 +2022,56 @@ msgstr "Falha ao excluir arquivo."
 msgid "Failed to save game"
 msgstr "Falha ao salvar o jogo"
 
-#: engines/kyra/lol.cpp:572
+#: engines/kyra/lol.cpp:478
 msgid "Attack 1"
 msgstr ""
 
-#: engines/kyra/lol.cpp:573
+#: engines/kyra/lol.cpp:479
 msgid "Attack 2"
 msgstr ""
 
-#: engines/kyra/lol.cpp:574
+#: engines/kyra/lol.cpp:480
 msgid "Attack 3"
 msgstr ""
 
-#: engines/kyra/lol.cpp:575
+#: engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr ""
 
-#: engines/kyra/lol.cpp:576
+#: engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr ""
 
-#: engines/kyra/lol.cpp:577
+#: engines/kyra/lol.cpp:483
 msgid "Slide Left"
 msgstr ""
 
-#: engines/kyra/lol.cpp:578
+#: engines/kyra/lol.cpp:484
 #, fuzzy
 msgid "Slide Right"
 msgstr "Direita"
 
-#: engines/kyra/lol.cpp:579
+#: engines/kyra/lol.cpp:485
 #, fuzzy
 msgid "Turn Left"
 msgstr "Desligar"
 
-#: engines/kyra/lol.cpp:580
+#: engines/kyra/lol.cpp:486
 #, fuzzy
 msgid "Turn Right"
 msgstr "Cursor para a direita"
 
-#: engines/kyra/lol.cpp:581
+#: engines/kyra/lol.cpp:487
 #, fuzzy
 msgid "Rest"
 msgstr "Restaurar"
 
-#: engines/kyra/lol.cpp:582
+#: engines/kyra/lol.cpp:488
 #, fuzzy
 msgid "Options"
 msgstr "~O~pções"
 
-#: engines/kyra/lol.cpp:583
+#: engines/kyra/lol.cpp:489
 #, fuzzy
 msgid "Choose Spell"
 msgstr "Escolher"
@@ -2106,17 +2106,17 @@ msgstr ""
 "O arquivo \"sky.cpt\" possui um tamanho incorreto.\n"
 "Por favor, refaça o download em www.scummvm.org"
 
-#: engines/sword1/animation.cpp:345 engines/sword2/animation.cpp:379
+#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379
 msgid "DXA cutscenes found but ScummVM has been built without zlib support"
 msgstr ""
 "Vídeos no formato DXA foram encontrados, mas o ScummVM foi compilado sem "
 "suporte a zlib"
 
-#: engines/sword1/animation.cpp:355 engines/sword2/animation.cpp:389
+#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389
 msgid "MPEG2 cutscenes are no longer supported"
 msgstr "Vídeos em MPEG2 não são mais suportados"
 
-#: engines/sword1/animation.cpp:360 engines/sword2/animation.cpp:397
+#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397
 #, c-format
 msgid "Cutscene '%s' not found"
 msgstr "Vídeo '%s' não encontrado"
@@ -2403,24 +2403,24 @@ msgstr "Modo Touchpad ligado."
 msgid "Touchpad mode disabled."
 msgstr "Modo Touchpad desligado."
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:67
+#: backends/platform/sdl/macosx/appmenu_osx.mm:78
 msgid "Hide ScummVM"
 msgstr "Ocultar ScummVM"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: backends/platform/sdl/macosx/appmenu_osx.mm:83
 msgid "Hide Others"
 msgstr "Ocultar Outros"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:74
+#: backends/platform/sdl/macosx/appmenu_osx.mm:88
 msgid "Show All"
 msgstr "Exibir Todos"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:92
-#: backends/platform/sdl/macosx/appmenu_osx.mm:99
+#: backends/platform/sdl/macosx/appmenu_osx.mm:110
+#: backends/platform/sdl/macosx/appmenu_osx.mm:121
 msgid "Window"
 msgstr "Janela"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:95
+#: backends/platform/sdl/macosx/appmenu_osx.mm:115
 msgid "Minimize"
 msgstr "Minimizar"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index e97f4ca..4254d5c 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2010-2012 ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Eugene Sandulenko <sev at scummvm.org>, 2010.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.3.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2011-12-26 15:26+0100\n"
+"POT-Creation-Date: 2012-01-28 21:48+0100\n"
 "PO-Revision-Date: 2011-08-20 13:22+0200\n"
 "Last-Translator: Eugene Sandulenko <sev at scummvm.org>\n"
 "Language-Team: Russian\n"
@@ -47,7 +47,7 @@ msgstr "
 #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
 #: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221
 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
-#: engines/engine.cpp:436 engines/scumm/dialogs.cpp:190
+#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190
 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
 #: backends/platform/wii/options.cpp:48
 #: backends/events/default/default-events.cpp:222
@@ -59,22 +59,22 @@ msgstr "
 msgid "Choose"
 msgstr "²ëÑàÐâì"
 
-#: gui/gui-manager.cpp:116 engines/scumm/help.cpp:125
+#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125
 #: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165
 #: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209
 #: backends/keymapper/remap-dialog.cpp:52
 msgid "Close"
 msgstr "·ÐÚàëâì"
 
-#: gui/gui-manager.cpp:119
+#: gui/gui-manager.cpp:118
 msgid "Mouse click"
 msgstr "ºÛØÚ Üëèìî"
 
-#: gui/gui-manager.cpp:122 base/main.cpp:283
+#: gui/gui-manager.cpp:121 base/main.cpp:289
 msgid "Display keyboard"
 msgstr "¿ÞÚÐ×Ðâì ÚÛÐÒØÐâãàã"
 
-#: gui/gui-manager.cpp:125 base/main.cpp:286
+#: gui/gui-manager.cpp:124 base/main.cpp:292
 msgid "Remap keys"
 msgstr "¿ÕàÕÝÐ×ÝÐçØâì ÚÛÐÒØèØ"
 
@@ -88,11 +88,11 @@ msgstr "
 
 #: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959
 #: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222
-#: engines/engine.cpp:359 engines/engine.cpp:370 engines/scumm/dialogs.cpp:192
+#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
 #: engines/scumm/scumm.cpp:1784 engines/agos/animation.cpp:551
 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
-#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:345
-#: engines/sword1/animation.cpp:355 engines/sword1/animation.cpp:361
+#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449
+#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465
 #: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633
 #: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389
 #: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281
@@ -346,7 +346,7 @@ msgstr "
 msgid "~Q~uit"
 msgstr "~²~ëåÞÔ"
 
-#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:80
+#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96
 msgid "Quit ScummVM"
 msgstr "²ëåÞÔ Ø× ScummVM"
 
@@ -354,7 +354,7 @@ msgstr "
 msgid "A~b~out..."
 msgstr "¾ ß~à~ÞÓàÐÜÜÕ..."
 
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:61
+#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70
 msgid "About ScummVM"
 msgstr "¾ ßàÞÓàÐÜÜÕ ScummVM"
 
@@ -965,28 +965,28 @@ msgstr "
 msgid "Select a Theme"
 msgstr "²ëÑÕàØâÕ âÕÜã"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgid "Disabled GFX"
 msgstr "±Õ× ÓàÐäØÚØ"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgctxt "lowres"
 msgid "Disabled GFX"
 msgstr "±Õ× ÓàÐäØÚØ"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard Renderer (16bpp)"
 msgstr "ÁâÐÝÔÐàâÝëÙ àÐáâÕàØ×ÐâÞà (16bpp)"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard (16bpp)"
 msgstr "ÁâÐÝÔÐàâÝëÙ àÐáâÕàØ×ÐâÞà (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased Renderer (16bpp)"
 msgstr "ÀÐáâÕàØ×ÐâÞà áÞ áÓÛÐÖØÒÐÝØÕÜ (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased (16bpp)"
 msgstr "ÀÐáâÕàØ×ÐâÞà áÞ áÓÛÐÖØÒÐÝØÕÜ (16bpp)"
 
@@ -999,30 +999,30 @@ msgstr "
 msgid "Engine does not support debug level '%s'"
 msgstr "´ÒØÖÞÚ ÝÕ ßÞÔÔÕàÖØÒÐÕâ ãàÞÒÕÝì ÞâÛÐÔÚØ '%s'"
 
-#: base/main.cpp:271
+#: base/main.cpp:277
 msgid "Menu"
 msgstr "¼ÕÝî"
 
-#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:280 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:277 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50
 #: backends/platform/wince/CEActionsPocket.cpp:42
 msgid "Pause"
 msgstr "¿Ðã×Ð"
 
-#: base/main.cpp:280
+#: base/main.cpp:286
 msgid "Skip line"
 msgstr "¿àÞßãáâØâì áâàÞÚã"
 
-#: base/main.cpp:439
+#: base/main.cpp:445
 msgid "Error running game:"
 msgstr "¾èØÑÚÐ ×ÐßãáÚÐ ØÓàë:"
 
-#: base/main.cpp:463
+#: base/main.cpp:469
 msgid "Could not find any engine capable of running the selected game"
 msgstr "½Õ ÜÞÓã ÝÐÙâØ ÔÒØÖÞÚ ÔÛï ×ÐßãáÚÐ ÒëÑàÐÝÝÞÙ ØÓàë"
 
@@ -1195,23 +1195,23 @@ msgstr "
 msgid "~K~eys"
 msgstr "~º~ÛÐÒØèØ"
 
-#: engines/engine.cpp:233
+#: engines/engine.cpp:235
 msgid "Could not initialize color format."
 msgstr "½Õ ÜÞÓã ØÝØæØÐÛØ×ØàÞÒÐâì äÞàÜÐâ æÒÕâÐ."
 
-#: engines/engine.cpp:241
+#: engines/engine.cpp:243
 msgid "Could not switch to video mode: '"
 msgstr "½Õ ãÔÐÛÞáì ßÕàÕÚÛîçØâì ÒØÔÕÞàÕÖØÜ: '"
 
-#: engines/engine.cpp:250
+#: engines/engine.cpp:252
 msgid "Could not apply aspect ratio setting."
 msgstr "½Õ ãÔÐÛÞáì ØáßÞÛì×ÞÒÐâì ÚÞààÕÚæØî áÞÞâÝÞèÕÝØï áâÞàÞÝ."
 
-#: engines/engine.cpp:255
+#: engines/engine.cpp:257
 msgid "Could not apply fullscreen setting."
 msgstr "½Õ ÜÞÓã ßàØÜÕÝØâì ßÞÛÝÞíÚàÐÝÝëÙ àÕÖØÜ."
 
-#: engines/engine.cpp:355
+#: engines/engine.cpp:357
 msgid ""
 "You appear to be playing this game directly\n"
 "from the CD. This is known to cause problems,\n"
@@ -1225,7 +1225,7 @@ msgstr ""
 "ÝÐ ÖñáâÚØÙ ÔØáÚ. ¿ÞÔàÞÑÝÞáâØ ÜÞÖÝÞ ÝÐÙâØ Ò\n"
 "äÐÙÛÕ README."
 
-#: engines/engine.cpp:366
+#: engines/engine.cpp:368
 msgid ""
 "This game has audio tracks in its disk. These\n"
 "tracks need to be ripped from the disk using\n"
@@ -1240,7 +1240,7 @@ msgstr ""
 "ßÞïÒØâáï Üã×ëÚÐ. ¿ÞÔàÞÑÝÞáâØ ÜÞÖÝÞ ÝÐÙâØ Ò\n"
 "äÐÙÛÕ README."
 
-#: engines/engine.cpp:433
+#: engines/engine.cpp:435
 msgid ""
 "WARNING: The game you are about to start is not yet fully supported by "
 "ScummVM. As such, it is likely to be unstable, and any saves you make might "
@@ -1250,7 +1250,7 @@ msgstr ""
 "ScummVM ßÞÛÝÞáâìî. ¾ÝÐ áÚÞàÕÕ ÒáÕÓÞ ÝÕ ÑãÔÕâ àÐÑÞâÐâì áâÐÑØÛìÝÞ, Ø "
 "áÞåàÐÝÕÝØï ØÓà ÜÞÓãâ ÝÕ àÐÑÞâÐâì Ò ÑãÔãéØå ÒÕàáØïå ScummVM."
 
-#: engines/engine.cpp:436
+#: engines/engine.cpp:438
 msgid "Start anyway"
 msgstr "²áñ àÐÒÝÞ ×ÐßãáâØâì"
 
@@ -2010,56 +2010,56 @@ msgstr "
 msgid "Failed to save game"
 msgstr "½Õ ãÔÐÛÞáì áÞåàÐÝØâì ØÓàã"
 
-#: engines/kyra/lol.cpp:572
+#: engines/kyra/lol.cpp:478
 msgid "Attack 1"
 msgstr ""
 
-#: engines/kyra/lol.cpp:573
+#: engines/kyra/lol.cpp:479
 msgid "Attack 2"
 msgstr ""
 
-#: engines/kyra/lol.cpp:574
+#: engines/kyra/lol.cpp:480
 msgid "Attack 3"
 msgstr ""
 
-#: engines/kyra/lol.cpp:575
+#: engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr ""
 
-#: engines/kyra/lol.cpp:576
+#: engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr ""
 
-#: engines/kyra/lol.cpp:577
+#: engines/kyra/lol.cpp:483
 msgid "Slide Left"
 msgstr ""
 
-#: engines/kyra/lol.cpp:578
+#: engines/kyra/lol.cpp:484
 #, fuzzy
 msgid "Slide Right"
 msgstr "²ßàÐÒÞ"
 
-#: engines/kyra/lol.cpp:579
+#: engines/kyra/lol.cpp:485
 #, fuzzy
 msgid "Turn Left"
 msgstr "²ëÚÛîçØâì"
 
-#: engines/kyra/lol.cpp:580
+#: engines/kyra/lol.cpp:486
 #, fuzzy
 msgid "Turn Right"
 msgstr "ºãàáÞà ÒßàÐÒÞ"
 
-#: engines/kyra/lol.cpp:581
+#: engines/kyra/lol.cpp:487
 #, fuzzy
 msgid "Rest"
 msgstr "²ÞááâÒÝÞÒØâì"
 
-#: engines/kyra/lol.cpp:582
+#: engines/kyra/lol.cpp:488
 #, fuzzy
 msgid "Options"
 msgstr "~¾~ßæØØ"
 
-#: engines/kyra/lol.cpp:583
+#: engines/kyra/lol.cpp:489
 #, fuzzy
 msgid "Choose Spell"
 msgstr "²ëÑàÐâì"
@@ -2095,16 +2095,16 @@ msgstr ""
 "ÄÐÙÛ sky.cpt ØÜÕÕâ ÝÕÒÕàÝëÙ àÐ×ÜÕà.\n"
 "¿ÞÖÐÛãÙáâÐ, áÚÐçÐÙâÕ ÕÓÞ ×ÐÝÞÒÞ á www.scummvm.org"
 
-#: engines/sword1/animation.cpp:345 engines/sword2/animation.cpp:379
+#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379
 msgid "DXA cutscenes found but ScummVM has been built without zlib support"
 msgstr ""
 "½ÐÙÔÕÝë ×ÐáâÐÒÚØ Ò äÞàÜÐâÕ DXA, ÝÞ ScummVM ÑëÛ áÞÑàÐÝ ÑÕ× ßÞÔÔÕàÖÚØ zlib"
 
-#: engines/sword1/animation.cpp:355 engines/sword2/animation.cpp:389
+#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389
 msgid "MPEG2 cutscenes are no longer supported"
 msgstr "·ÐáâÐÒÚØ Ò äÞàÜÐâÕ MPEG2 ÑÞÛìèÕ ÝÕ ßÞÔÔÕàÖØÒÐîâáï"
 
-#: engines/sword1/animation.cpp:360 engines/sword2/animation.cpp:397
+#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397
 #, c-format
 msgid "Cutscene '%s' not found"
 msgstr "·ÐáâÐÒÚÐ '%s' ÝÕ ÝÐÙÔÕÝÐ"
@@ -2389,24 +2389,24 @@ msgstr "
 msgid "Touchpad mode disabled."
 msgstr "ÀÕÖØÜ âÐçßÐÔÐ ÒëÚÛîçÕÝ."
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:67
+#: backends/platform/sdl/macosx/appmenu_osx.mm:78
 msgid "Hide ScummVM"
 msgstr "ÁßàïâÐâì ScummVM"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: backends/platform/sdl/macosx/appmenu_osx.mm:83
 msgid "Hide Others"
 msgstr "ÁßàïâÐâì ´àãÓØÕ"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:74
+#: backends/platform/sdl/macosx/appmenu_osx.mm:88
 msgid "Show All"
 msgstr "¿ÞÚÐ×Ðâì Òáñ"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:92
-#: backends/platform/sdl/macosx/appmenu_osx.mm:99
+#: backends/platform/sdl/macosx/appmenu_osx.mm:110
+#: backends/platform/sdl/macosx/appmenu_osx.mm:121
 msgid "Window"
 msgstr "¾ÚÝÞ"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:95
+#: backends/platform/sdl/macosx/appmenu_osx.mm:115
 msgid "Minimize"
 msgstr "¼ØÝØÜØ×ØàÞÒÐâì"
 
diff --git a/po/scummvm.pot b/po/scummvm.pot
index 01d419d..7676fa6 100644
--- a/po/scummvm.pot
+++ b/po/scummvm.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.5.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2011-12-26 15:26+0100\n"
+"POT-Creation-Date: 2012-01-28 21:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -46,7 +46,7 @@ msgstr ""
 #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
 #: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221
 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
-#: engines/engine.cpp:436 engines/scumm/dialogs.cpp:190
+#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190
 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
 #: backends/platform/wii/options.cpp:48
 #: backends/events/default/default-events.cpp:222
@@ -58,22 +58,22 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: gui/gui-manager.cpp:116 engines/scumm/help.cpp:125
+#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125
 #: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165
 #: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209
 #: backends/keymapper/remap-dialog.cpp:52
 msgid "Close"
 msgstr ""
 
-#: gui/gui-manager.cpp:119
+#: gui/gui-manager.cpp:118
 msgid "Mouse click"
 msgstr ""
 
-#: gui/gui-manager.cpp:122 base/main.cpp:283
+#: gui/gui-manager.cpp:121 base/main.cpp:289
 msgid "Display keyboard"
 msgstr ""
 
-#: gui/gui-manager.cpp:125 base/main.cpp:286
+#: gui/gui-manager.cpp:124 base/main.cpp:292
 msgid "Remap keys"
 msgstr ""
 
@@ -87,11 +87,11 @@ msgstr ""
 
 #: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959
 #: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222
-#: engines/engine.cpp:359 engines/engine.cpp:370 engines/scumm/dialogs.cpp:192
+#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
 #: engines/scumm/scumm.cpp:1784 engines/agos/animation.cpp:551
 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
-#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:345
-#: engines/sword1/animation.cpp:355 engines/sword1/animation.cpp:361
+#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449
+#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465
 #: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633
 #: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389
 #: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281
@@ -342,7 +342,7 @@ msgstr ""
 msgid "~Q~uit"
 msgstr ""
 
-#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:80
+#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96
 msgid "Quit ScummVM"
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 msgid "A~b~out..."
 msgstr ""
 
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:61
+#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70
 msgid "About ScummVM"
 msgstr ""
 
@@ -943,28 +943,28 @@ msgstr ""
 msgid "Select a Theme"
 msgstr ""
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgid "Disabled GFX"
 msgstr ""
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgctxt "lowres"
 msgid "Disabled GFX"
 msgstr ""
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard Renderer (16bpp)"
 msgstr ""
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard (16bpp)"
 msgstr ""
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased Renderer (16bpp)"
 msgstr ""
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased (16bpp)"
 msgstr ""
 
@@ -977,30 +977,30 @@ msgstr ""
 msgid "Engine does not support debug level '%s'"
 msgstr ""
 
-#: base/main.cpp:271
+#: base/main.cpp:277
 msgid "Menu"
 msgstr ""
 
-#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:280 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:277 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50
 #: backends/platform/wince/CEActionsPocket.cpp:42
 msgid "Pause"
 msgstr ""
 
-#: base/main.cpp:280
+#: base/main.cpp:286
 msgid "Skip line"
 msgstr ""
 
-#: base/main.cpp:439
+#: base/main.cpp:445
 msgid "Error running game:"
 msgstr ""
 
-#: base/main.cpp:463
+#: base/main.cpp:469
 msgid "Could not find any engine capable of running the selected game"
 msgstr ""
 
@@ -1169,23 +1169,23 @@ msgstr ""
 msgid "~K~eys"
 msgstr ""
 
-#: engines/engine.cpp:233
+#: engines/engine.cpp:235
 msgid "Could not initialize color format."
 msgstr ""
 
-#: engines/engine.cpp:241
+#: engines/engine.cpp:243
 msgid "Could not switch to video mode: '"
 msgstr ""
 
-#: engines/engine.cpp:250
+#: engines/engine.cpp:252
 msgid "Could not apply aspect ratio setting."
 msgstr ""
 
-#: engines/engine.cpp:255
+#: engines/engine.cpp:257
 msgid "Could not apply fullscreen setting."
 msgstr ""
 
-#: engines/engine.cpp:355
+#: engines/engine.cpp:357
 msgid ""
 "You appear to be playing this game directly\n"
 "from the CD. This is known to cause problems,\n"
@@ -1194,7 +1194,7 @@ msgid ""
 "See the README file for details."
 msgstr ""
 
-#: engines/engine.cpp:366
+#: engines/engine.cpp:368
 msgid ""
 "This game has audio tracks in its disk. These\n"
 "tracks need to be ripped from the disk using\n"
@@ -1203,14 +1203,14 @@ msgid ""
 "See the README file for details."
 msgstr ""
 
-#: engines/engine.cpp:433
+#: engines/engine.cpp:435
 msgid ""
 "WARNING: The game you are about to start is not yet fully supported by "
 "ScummVM. As such, it is likely to be unstable, and any saves you make might "
 "not work in future versions of ScummVM."
 msgstr ""
 
-#: engines/engine.cpp:436
+#: engines/engine.cpp:438
 msgid "Start anyway"
 msgstr ""
 
@@ -1955,51 +1955,51 @@ msgstr ""
 msgid "Failed to save game"
 msgstr ""
 
-#: engines/kyra/lol.cpp:572
+#: engines/kyra/lol.cpp:478
 msgid "Attack 1"
 msgstr ""
 
-#: engines/kyra/lol.cpp:573
+#: engines/kyra/lol.cpp:479
 msgid "Attack 2"
 msgstr ""
 
-#: engines/kyra/lol.cpp:574
+#: engines/kyra/lol.cpp:480
 msgid "Attack 3"
 msgstr ""
 
-#: engines/kyra/lol.cpp:575
+#: engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr ""
 
-#: engines/kyra/lol.cpp:576
+#: engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr ""
 
-#: engines/kyra/lol.cpp:577
+#: engines/kyra/lol.cpp:483
 msgid "Slide Left"
 msgstr ""
 
-#: engines/kyra/lol.cpp:578
+#: engines/kyra/lol.cpp:484
 msgid "Slide Right"
 msgstr ""
 
-#: engines/kyra/lol.cpp:579
+#: engines/kyra/lol.cpp:485
 msgid "Turn Left"
 msgstr ""
 
-#: engines/kyra/lol.cpp:580
+#: engines/kyra/lol.cpp:486
 msgid "Turn Right"
 msgstr ""
 
-#: engines/kyra/lol.cpp:581
+#: engines/kyra/lol.cpp:487
 msgid "Rest"
 msgstr ""
 
-#: engines/kyra/lol.cpp:582
+#: engines/kyra/lol.cpp:488
 msgid "Options"
 msgstr ""
 
-#: engines/kyra/lol.cpp:583
+#: engines/kyra/lol.cpp:489
 msgid "Choose Spell"
 msgstr ""
 
@@ -2024,15 +2024,15 @@ msgid ""
 "Please (re)download it from www.scummvm.org"
 msgstr ""
 
-#: engines/sword1/animation.cpp:345 engines/sword2/animation.cpp:379
+#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379
 msgid "DXA cutscenes found but ScummVM has been built without zlib support"
 msgstr ""
 
-#: engines/sword1/animation.cpp:355 engines/sword2/animation.cpp:389
+#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389
 msgid "MPEG2 cutscenes are no longer supported"
 msgstr ""
 
-#: engines/sword1/animation.cpp:360 engines/sword2/animation.cpp:397
+#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397
 #, c-format
 msgid "Cutscene '%s' not found"
 msgstr ""
@@ -2289,24 +2289,24 @@ msgstr ""
 msgid "Touchpad mode disabled."
 msgstr ""
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:67
+#: backends/platform/sdl/macosx/appmenu_osx.mm:78
 msgid "Hide ScummVM"
 msgstr ""
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: backends/platform/sdl/macosx/appmenu_osx.mm:83
 msgid "Hide Others"
 msgstr ""
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:74
+#: backends/platform/sdl/macosx/appmenu_osx.mm:88
 msgid "Show All"
 msgstr ""
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:92
-#: backends/platform/sdl/macosx/appmenu_osx.mm:99
+#: backends/platform/sdl/macosx/appmenu_osx.mm:110
+#: backends/platform/sdl/macosx/appmenu_osx.mm:121
 msgid "Window"
 msgstr ""
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:95
+#: backends/platform/sdl/macosx/appmenu_osx.mm:115
 msgid "Minimize"
 msgstr ""
 
diff --git a/po/se_SE.po b/po/se_SE.po
index 058e5ce..b7fef60 100644
--- a/po/se_SE.po
+++ b/po/se_SE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.3.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2011-12-26 15:26+0100\n"
+"POT-Creation-Date: 2012-01-28 21:48+0100\n"
 "PO-Revision-Date: 2011-11-27 19:00+0100\n"
 "Last-Translator: Hampus Flink <hampus.flink at gmail.com>\n"
 "Language-Team: \n"
@@ -49,7 +49,7 @@ msgstr "Upp
 #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
 #: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221
 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
-#: engines/engine.cpp:436 engines/scumm/dialogs.cpp:190
+#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190
 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
 #: backends/platform/wii/options.cpp:48
 #: backends/events/default/default-events.cpp:222
@@ -61,22 +61,22 @@ msgstr "Avbryt"
 msgid "Choose"
 msgstr "Välj"
 
-#: gui/gui-manager.cpp:116 engines/scumm/help.cpp:125
+#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125
 #: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165
 #: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209
 #: backends/keymapper/remap-dialog.cpp:52
 msgid "Close"
 msgstr "Stäng"
 
-#: gui/gui-manager.cpp:119
+#: gui/gui-manager.cpp:118
 msgid "Mouse click"
 msgstr "Musklick"
 
-#: gui/gui-manager.cpp:122 base/main.cpp:283
+#: gui/gui-manager.cpp:121 base/main.cpp:289
 msgid "Display keyboard"
 msgstr "Visa tangentbord"
 
-#: gui/gui-manager.cpp:125 base/main.cpp:286
+#: gui/gui-manager.cpp:124 base/main.cpp:292
 msgid "Remap keys"
 msgstr "Ställ in tangenter"
 
@@ -90,11 +90,11 @@ msgstr "St
 
 #: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959
 #: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222
-#: engines/engine.cpp:359 engines/engine.cpp:370 engines/scumm/dialogs.cpp:192
+#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
 #: engines/scumm/scumm.cpp:1784 engines/agos/animation.cpp:551
 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
-#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:345
-#: engines/sword1/animation.cpp:355 engines/sword1/animation.cpp:361
+#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449
+#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465
 #: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633
 #: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389
 #: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281
@@ -349,7 +349,7 @@ msgstr "Detta ID-namn 
 msgid "~Q~uit"
 msgstr "~A~vsluta"
 
-#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:80
+#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96
 msgid "Quit ScummVM"
 msgstr "Avsluta ScummVM"
 
@@ -357,7 +357,7 @@ msgstr "Avsluta ScummVM"
 msgid "A~b~out..."
 msgstr "O~m~..."
 
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:61
+#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70
 msgid "About ScummVM"
 msgstr "Om ScummVM"
 
@@ -963,28 +963,28 @@ msgstr "Namnl
 msgid "Select a Theme"
 msgstr "Välj ett tema"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgid "Disabled GFX"
 msgstr "Inaktiverad GFX"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgctxt "lowres"
 msgid "Disabled GFX"
 msgstr "Inaktiverad GFX"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard Renderer (16bpp)"
 msgstr "Standard rendering (16 bpp)"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard (16bpp)"
 msgstr "Standard (16 bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased Renderer (16bpp)"
 msgstr "Antialiserad rendering (16 bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased (16bpp)"
 msgstr "Antialiserad (16 bpp)"
 
@@ -997,30 +997,30 @@ msgstr "T
 msgid "Engine does not support debug level '%s'"
 msgstr "Motorn stöder inte debug-nivå '%s'"
 
-#: base/main.cpp:271
+#: base/main.cpp:277
 msgid "Menu"
 msgstr "Meny"
 
-#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:280 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:277 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50
 #: backends/platform/wince/CEActionsPocket.cpp:42
 msgid "Pause"
 msgstr "Paus"
 
-#: base/main.cpp:280
+#: base/main.cpp:286
 msgid "Skip line"
 msgstr "Skippa rad"
 
-#: base/main.cpp:439
+#: base/main.cpp:445
 msgid "Error running game:"
 msgstr "Fel under körning av spel:"
 
-#: base/main.cpp:463
+#: base/main.cpp:469
 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"
 
@@ -1193,23 +1193,23 @@ msgstr "A~v~bryt"
 msgid "~K~eys"
 msgstr "~T~angenter"
 
-#: engines/engine.cpp:233
+#: engines/engine.cpp:235
 msgid "Could not initialize color format."
 msgstr "Kunde inte initialisera färgformat."
 
-#: engines/engine.cpp:241
+#: engines/engine.cpp:243
 msgid "Could not switch to video mode: '"
 msgstr "Kunde inte byta till videoläget: '"
 
-#: engines/engine.cpp:250
+#: engines/engine.cpp:252
 msgid "Could not apply aspect ratio setting."
 msgstr "Kunde inte ändra inställningen för bildförhållanden."
 
-#: engines/engine.cpp:255
+#: engines/engine.cpp:257
 msgid "Could not apply fullscreen setting."
 msgstr "Kunde inte applicera fullskärmsinställning."
 
-#: engines/engine.cpp:355
+#: engines/engine.cpp:357
 msgid ""
 "You appear to be playing this game directly\n"
 "from the CD. This is known to cause problems,\n"
@@ -1223,7 +1223,7 @@ msgstr ""
 "datafilerna till din hårddisk istället.\n"
 "Se README-filen för detaljer."
 
-#: engines/engine.cpp:366
+#: engines/engine.cpp:368
 msgid ""
 "This game has audio tracks in its disk. These\n"
 "tracks need to be ripped from the disk using\n"
@@ -1237,7 +1237,7 @@ msgstr ""
 "för att kunna lyssna på spelets musik.\n"
 "Se README-filen för detaljer."
 
-#: engines/engine.cpp:433
+#: engines/engine.cpp:435
 msgid ""
 "WARNING: The game you are about to start is not yet fully supported by "
 "ScummVM. As such, it is likely to be unstable, and any saves you make might "
@@ -1247,7 +1247,7 @@ msgstr ""
 "ScummVM. Därför är det troligtvis instabilt och om du skapar spardata kan de "
 "möjligtvis vara inkompatibla med framtida versioner av ScummVM."
 
-#: engines/engine.cpp:436
+#: engines/engine.cpp:438
 msgid "Start anyway"
 msgstr "Starta ändå"
 
@@ -2007,51 +2007,51 @@ msgstr "Kunde inte radera filen."
 msgid "Failed to save game"
 msgstr "Kunde inte spara spelet."
 
-#: engines/kyra/lol.cpp:572
+#: engines/kyra/lol.cpp:478
 msgid "Attack 1"
 msgstr "Attack 1"
 
-#: engines/kyra/lol.cpp:573
+#: engines/kyra/lol.cpp:479
 msgid "Attack 2"
 msgstr "Attack 2"
 
-#: engines/kyra/lol.cpp:574
+#: engines/kyra/lol.cpp:480
 msgid "Attack 3"
 msgstr "Attack 3"
 
-#: engines/kyra/lol.cpp:575
+#: engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Steg framåt"
 
-#: engines/kyra/lol.cpp:576
+#: engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Steg bakåt"
 
-#: engines/kyra/lol.cpp:577
+#: engines/kyra/lol.cpp:483
 msgid "Slide Left"
 msgstr "Glid vänster"
 
-#: engines/kyra/lol.cpp:578
+#: engines/kyra/lol.cpp:484
 msgid "Slide Right"
 msgstr "Glid höger"
 
-#: engines/kyra/lol.cpp:579
+#: engines/kyra/lol.cpp:485
 msgid "Turn Left"
 msgstr "Sväng vänster"
 
-#: engines/kyra/lol.cpp:580
+#: engines/kyra/lol.cpp:486
 msgid "Turn Right"
 msgstr "Sväng höger"
 
-#: engines/kyra/lol.cpp:581
+#: engines/kyra/lol.cpp:487
 msgid "Rest"
 msgstr "Vila"
 
-#: engines/kyra/lol.cpp:582
+#: engines/kyra/lol.cpp:488
 msgid "Options"
 msgstr "Inställningar"
 
-#: engines/kyra/lol.cpp:583
+#: engines/kyra/lol.cpp:489
 msgid "Choose Spell"
 msgstr "Välj trollformel"
 
@@ -2085,15 +2085,15 @@ msgstr ""
 "Filen \"sky.cpt\" har inkorrekt filstorlek.\n"
 "Var god ladda hem den igen från www.scummvm.org"
 
-#: engines/sword1/animation.cpp:345 engines/sword2/animation.cpp:379
+#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379
 msgid "DXA cutscenes found but ScummVM has been built without zlib support"
 msgstr "DXA filmscener hittades men ScummVM har byggts utan stöd för zlib"
 
-#: engines/sword1/animation.cpp:355 engines/sword2/animation.cpp:389
+#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389
 msgid "MPEG2 cutscenes are no longer supported"
 msgstr "MPEG2 filmscener stöds inte längre"
 
-#: engines/sword1/animation.cpp:360 engines/sword2/animation.cpp:397
+#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397
 #, c-format
 msgid "Cutscene '%s' not found"
 msgstr "Filmscenen '%s' hittades ej"
@@ -2380,24 +2380,24 @@ msgstr "Touchpad-l
 msgid "Touchpad mode disabled."
 msgstr "Touchpad-läge inaktiverat."
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:67
+#: backends/platform/sdl/macosx/appmenu_osx.mm:78
 msgid "Hide ScummVM"
 msgstr "Dölj ScummVM"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: backends/platform/sdl/macosx/appmenu_osx.mm:83
 msgid "Hide Others"
 msgstr "Dölj övriga"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:74
+#: backends/platform/sdl/macosx/appmenu_osx.mm:88
 msgid "Show All"
 msgstr "Visa alla"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:92
-#: backends/platform/sdl/macosx/appmenu_osx.mm:99
+#: backends/platform/sdl/macosx/appmenu_osx.mm:110
+#: backends/platform/sdl/macosx/appmenu_osx.mm:121
 msgid "Window"
 msgstr "Fönster"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:95
+#: backends/platform/sdl/macosx/appmenu_osx.mm:115
 msgid "Minimize"
 msgstr "Minimera"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 0fd9015..cb29d20 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2010-2012 ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Lubomyr Lisen, 2010.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.3.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2011-12-26 15:26+0100\n"
+"POT-Creation-Date: 2012-01-28 21:48+0100\n"
 "PO-Revision-Date: 2011-08-20 13:30+0200\n"
 "Last-Translator: Eugene Sandulenko\n"
 "Language-Team: Ukrainian\n"
@@ -47,7 +47,7 @@ msgstr "
 #: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
 #: gui/launcher.cpp:319 gui/massadd.cpp:94 gui/options.cpp:1221
 #: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
-#: engines/engine.cpp:436 engines/scumm/dialogs.cpp:190
+#: engines/engine.cpp:438 engines/scumm/dialogs.cpp:190
 #: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
 #: backends/platform/wii/options.cpp:48
 #: backends/events/default/default-events.cpp:222
@@ -59,22 +59,22 @@ msgstr "
 msgid "Choose"
 msgstr "²ØÑàÐâØ"
 
-#: gui/gui-manager.cpp:116 engines/scumm/help.cpp:125
+#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125
 #: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165
 #: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209
 #: backends/keymapper/remap-dialog.cpp:52
 msgid "Close"
 msgstr "·ÐÚàØâØ"
 
-#: gui/gui-manager.cpp:119
+#: gui/gui-manager.cpp:118
 msgid "Mouse click"
 msgstr "ºÛöÚ ÜØèÚÞî"
 
-#: gui/gui-manager.cpp:122 base/main.cpp:283
+#: gui/gui-manager.cpp:121 base/main.cpp:289
 msgid "Display keyboard"
 msgstr "¿ÞÚÐ×ÐâØ ÚÛÐÒöÐâãàã"
 
-#: gui/gui-manager.cpp:125 base/main.cpp:286
+#: gui/gui-manager.cpp:124 base/main.cpp:292
 msgid "Remap keys"
 msgstr "¿ÕàÕßàØ×ÝÐçØâØ ÚÛÐÒöèö"
 
@@ -88,11 +88,11 @@ msgstr "
 
 #: gui/KeysDialog.cpp:42 gui/launcher.cpp:320 gui/launcher.cpp:959
 #: gui/launcher.cpp:963 gui/massadd.cpp:91 gui/options.cpp:1222
-#: engines/engine.cpp:359 engines/engine.cpp:370 engines/scumm/dialogs.cpp:192
+#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
 #: engines/scumm/scumm.cpp:1784 engines/agos/animation.cpp:551
 #: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
-#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:345
-#: engines/sword1/animation.cpp:355 engines/sword1/animation.cpp:361
+#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:449
+#: engines/sword1/animation.cpp:459 engines/sword1/animation.cpp:465
 #: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633
 #: engines/sword2/animation.cpp:379 engines/sword2/animation.cpp:389
 #: engines/sword2/animation.cpp:398 engines/parallaction/saveload.cpp:281
@@ -347,7 +347,7 @@ msgstr "
 msgid "~Q~uit"
 msgstr "~²~ØåöÔ"
 
-#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:80
+#: gui/launcher.cpp:578 backends/platform/sdl/macosx/appmenu_osx.mm:96
 msgid "Quit ScummVM"
 msgstr "²ØåöÔ ×ö ScummVM"
 
@@ -355,7 +355,7 @@ msgstr "
 msgid "A~b~out..."
 msgstr "¿àÞ ß~à~ÞÓàÐÜã..."
 
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:61
+#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:70
 msgid "About ScummVM"
 msgstr "¿àÞ ScummVM"
 
@@ -962,28 +962,28 @@ msgstr "
 msgid "Select a Theme"
 msgstr "²ØÑÕàöâì âÕÜã"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgid "Disabled GFX"
 msgstr "±Õ× ÓàÐäöÚØ"
 
-#: gui/ThemeEngine.cpp:329
+#: gui/ThemeEngine.cpp:333
 msgctxt "lowres"
 msgid "Disabled GFX"
 msgstr "±Õ× ÓàÐäöÚØ"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard Renderer (16bpp)"
 msgstr "ÁâÐÝÔÐàâÝØÙ àÐáâÕàØ×ÐâÞà (16bpp)"
 
-#: gui/ThemeEngine.cpp:330
+#: gui/ThemeEngine.cpp:334
 msgid "Standard (16bpp)"
 msgstr "ÁâÐÝÔÐàâÝØÙ àÐáâÕàØ×ÐâÞà (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased Renderer (16bpp)"
 msgstr "ÀÐáâÕàØ×ÐâÞà ×ö ×ÓÛÐÔÖãÒÐÝÝïÜ (16bpp)"
 
-#: gui/ThemeEngine.cpp:332
+#: gui/ThemeEngine.cpp:336
 msgid "Antialiased (16bpp)"
 msgstr "ÀÐáâÕàØ×ÐâÞà ×ö ×ÓÛÐÔÖãÒÐÝÝïÜ (16bpp)"
 
@@ -996,30 +996,30 @@ msgstr "
 msgid "Engine does not support debug level '%s'"
 msgstr "´ÒØÖÞÚ ÝÕ ßöÔâàØÜãô àöÒÕÝì ÒöÔÛÐÔÚØ '%s'"
 
-#: base/main.cpp:271
+#: base/main.cpp:277
 msgid "Menu"
 msgstr "¼ÕÝî"
 
-#: base/main.cpp:274 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:280 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:277 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:283 backends/platform/symbian/src/SymbianActions.cpp:50
 #: backends/platform/wince/CEActionsPocket.cpp:42
 msgid "Pause"
 msgstr "¿Ðã×Ð"
 
-#: base/main.cpp:280
+#: base/main.cpp:286
 msgid "Skip line"
 msgstr "¿àÞßãáâØâØ àïÔÞÚ"
 
-#: base/main.cpp:439
+#: base/main.cpp:445
 msgid "Error running game:"
 msgstr "¿ÞÜØÛÚÐ ×ÐßãáÚã ÓàØ:"
 
-#: base/main.cpp:463
+#: base/main.cpp:469
 msgid "Could not find any engine capable of running the selected game"
 msgstr "½Õ ÜÞÖã ×ÝÐÙâØ ÔÒØÖÞÚ ÔÛï ×ÐßãáÚã ÒØÑàÐÝÞ÷ ÓàØ"
 
@@ -1191,23 +1191,23 @@ msgstr "
 msgid "~K~eys"
 msgstr "~º~ÛÐÒöèö"
 
-#: engines/engine.cpp:233
+#: engines/engine.cpp:235
 msgid "Could not initialize color format."
 msgstr "½Õ ÜÞÖã ÝÐÛÐèâãÒÐâØ äÞàÜÐâ ÚÞÛìÞàã."
 
-#: engines/engine.cpp:241
+#: engines/engine.cpp:243
 msgid "Could not switch to video mode: '"
 msgstr "½Õ ÒÔÐÛÞáï ßÕàÕÚÛîçØâØ ÒöÔÕÞàÕÖØÜ: '"
 
-#: engines/engine.cpp:250
+#: engines/engine.cpp:252
 msgid "Could not apply aspect ratio setting."
 msgstr "½Õ ÒÔÐÛÞáï ×ÐáâÞáãÒÐâØ ÚÞàÕÚæöî áßöÒÒöÔÝÞèÕÝÝï áâÞàöÝ."
 
-#: engines/engine.cpp:255
+#: engines/engine.cpp:257
 msgid "Could not apply fullscreen setting."
 msgstr "½Õ ÒÔÐÛÞáï ×ÐáâÞáãÒÐâØ ßÞÒÝÞÕÚàÐÝÝØÙ àÕÖØÜ."
 
-#: engines/engine.cpp:355
+#: engines/engine.cpp:357
 msgid ""
 "You appear to be playing this game directly\n"
 "from the CD. This is known to cause problems,\n"
@@ -1221,7 +1221,7 @@ msgstr ""
 "ÓàØ ÝÐ ÖÞàáâÚØÙ ÔØáÚ.\n"
 "´ØÒöâìáï äÐÙÛ README ÔÛï ßÞÔÐÛìèØå öÝáâàãÚæöÙ."
 
-#: engines/engine.cpp:366
+#: engines/engine.cpp:368
 msgid ""
 "This game has audio tracks in its disk. These\n"
 "tracks need to be ripped from the disk using\n"
@@ -1235,7 +1235,7 @@ msgstr ""
 "âÞÓÞ, éÞÑ ÜÞÖÝÐ ÑãÛÞ áÛãåÐâØ Üã×ØÚã ã Óàö.\n"
 "´ØÒöâìáï äÐÙÛ README ÔÛï ßÞÔÐÛìèØå öÝáâàãÚæöÙ."
 
-#: engines/engine.cpp:433
+#: engines/engine.cpp:435
 msgid ""
 "WARNING: The game you are about to start is not yet fully supported by "
 "ScummVM. As such, it is likely to be unstable, and any saves you make might "
@@ -1245,7 +1245,7 @@ msgstr ""
 "ScummVM. ÁÚÞàèÕ ×Ð ÒáÕ ÒÞÝÐ ÝÕ ÑãÔÕ ßàÐæîÒÐâØ áâÐÑöÛìÝÞ, ö ×ÑÕàÕÖÕÝÝï öÓÞà, "
 "ïÚö ÒØ ×àÞÑØâÕ, ÜÞÖãâì ÝÕ ßàÐæîÒÐâØ ã ßÞÔÐÛìèØå ÒÕàáöïå ScummVM."
 
-#: engines/engine.cpp:436
+#: engines/engine.cpp:438
 msgid "Start anyway"
 msgstr "²áÕ ÞÔÝÞ ×ÐßãáâØâØ"
 
@@ -2005,56 +2005,56 @@ msgstr "
 msgid "Failed to save game"
 msgstr "½Õ ÒÔÐÛÞáï ×ÐßØáÐâØ Óàã"
 
-#: engines/kyra/lol.cpp:572
+#: engines/kyra/lol.cpp:478
 msgid "Attack 1"
 msgstr ""
 
-#: engines/kyra/lol.cpp:573
+#: engines/kyra/lol.cpp:479
 msgid "Attack 2"
 msgstr ""
 
-#: engines/kyra/lol.cpp:574
+#: engines/kyra/lol.cpp:480
 msgid "Attack 3"
 msgstr ""
 
-#: engines/kyra/lol.cpp:575
+#: engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr ""
 
-#: engines/kyra/lol.cpp:576
+#: engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr ""
 
-#: engines/kyra/lol.cpp:577
+#: engines/kyra/lol.cpp:483
 msgid "Slide Left"
 msgstr ""
 
-#: engines/kyra/lol.cpp:578
+#: engines/kyra/lol.cpp:484
 #, fuzzy
 msgid "Slide Right"
 msgstr "½ÐßàÐÒÞ"
 
-#: engines/kyra/lol.cpp:579
+#: engines/kyra/lol.cpp:485
 #, fuzzy
 msgid "Turn Left"
 msgstr "²ØÜÚÝãâØ"
 
-#: engines/kyra/lol.cpp:580
+#: engines/kyra/lol.cpp:486
 #, fuzzy
 msgid "Turn Right"
 msgstr "ºãàáÞà ÝÐßàÐÒÞ"
 
-#: engines/kyra/lol.cpp:581
+#: engines/kyra/lol.cpp:487
 #, fuzzy
 msgid "Rest"
 msgstr "²öÔÝÞÒØâØ"
 
-#: engines/kyra/lol.cpp:582
+#: engines/kyra/lol.cpp:488
 #, fuzzy
 msgid "Options"
 msgstr "~½~ÐÛÐèâãÒÐÝÝï"
 
-#: engines/kyra/lol.cpp:583
+#: engines/kyra/lol.cpp:489
 #, fuzzy
 msgid "Choose Spell"
 msgstr "²ØÑàÐâØ"
@@ -2089,15 +2089,15 @@ msgstr ""
 "ÄÐÙÛ sky.cpt ÜÐô ÝÕÒöàÝØÙ àÞ×Üöà.\n"
 "±ãÔì ÛÐáÚÐ, (ßÕàÕ)×ÐÒÐÝâÐÖâÕ ÙÞÓÞ × www.scummvm.org"
 
-#: engines/sword1/animation.cpp:345 engines/sword2/animation.cpp:379
+#: engines/sword1/animation.cpp:449 engines/sword2/animation.cpp:379
 msgid "DXA cutscenes found but ScummVM has been built without zlib support"
 msgstr "·ÝÐÙÔÕÝÞ ×ÐáâÐÒÚØ DXA, ÐÛÕ ScummVM ÑãÒ ßÞÑãÔÞÒÐÝØÙ ÑÕ× ßöÔâàØÜÚØ zlib"
 
-#: engines/sword1/animation.cpp:355 engines/sword2/animation.cpp:389
+#: engines/sword1/animation.cpp:459 engines/sword2/animation.cpp:389
 msgid "MPEG2 cutscenes are no longer supported"
 msgstr "·ÐáâÐÒÚØ MPEG2 ÑöÛìèÕ ÝÕ ßöÔâàØÜãîâìáï"
 
-#: engines/sword1/animation.cpp:360 engines/sword2/animation.cpp:397
+#: engines/sword1/animation.cpp:464 engines/sword2/animation.cpp:397
 #, c-format
 msgid "Cutscene '%s' not found"
 msgstr "·ÐáâÐÒÚã '%s' ÝÕ ×ÝÐÙÔÕÝÞ"
@@ -2382,24 +2382,24 @@ msgstr "
 msgid "Touchpad mode disabled."
 msgstr "ÀÕÖØÜ âÐçßÐÔã ÒØÜÚÝÕÝÞ."
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:67
+#: backends/platform/sdl/macosx/appmenu_osx.mm:78
 msgid "Hide ScummVM"
 msgstr "ÁåÞÒÐâØ ScummVM"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: backends/platform/sdl/macosx/appmenu_osx.mm:83
 msgid "Hide Others"
 msgstr "ÁåÞÒÐâØ ¦Ýèö"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:74
+#: backends/platform/sdl/macosx/appmenu_osx.mm:88
 msgid "Show All"
 msgstr "¿ÞÚÐ×ÐâØ ²áÕ"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:92
-#: backends/platform/sdl/macosx/appmenu_osx.mm:99
+#: backends/platform/sdl/macosx/appmenu_osx.mm:110
+#: backends/platform/sdl/macosx/appmenu_osx.mm:121
 msgid "Window"
 msgstr "²öÚÝÞ"
 
-#: backends/platform/sdl/macosx/appmenu_osx.mm:95
+#: backends/platform/sdl/macosx/appmenu_osx.mm:115
 msgid "Minimize"
 msgstr "¼öÝöÜö×ãÒÐâØ"
 


Commit: b0dfd08ff90347a3240aff9b94fe33e3f09f4dd4
    https://github.com/scummvm/scummvm/commit/b0dfd08ff90347a3240aff9b94fe33e3f09f4dd4
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-01-29T07:26:20-08:00

Commit Message:
GUI: Fix anti-aliased font drawing of checkbox/radio button texts.

Formerly the text background was not restored thus every time it got redrawn
the text got thicker.

Changed paths:
    gui/ThemeEngine.cpp



diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 3cfa555..fb8db00 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -906,7 +906,7 @@ void ThemeEngine::drawCheckbox(const Common::Rect &r, const Common::String &str,
 	r2.left = r2.right + checkBoxSize;
 	r2.right = r.right;
 
-	queueDDText(getTextData(dd), getTextColor(dd), r2, str, false, false, _widgets[kDDCheckboxDefault]->_textAlignH, _widgets[dd]->_textAlignV);
+	queueDDText(getTextData(dd), getTextColor(dd), r2, str, true, false, _widgets[kDDCheckboxDefault]->_textAlignH, _widgets[dd]->_textAlignV);
 }
 
 void ThemeEngine::drawRadiobutton(const Common::Rect &r, const Common::String &str, bool checked, WidgetStateInfo state) {
@@ -932,7 +932,7 @@ void ThemeEngine::drawRadiobutton(const Common::Rect &r, const Common::String &s
 	r2.left = r2.right + checkBoxSize;
 	r2.right = r.right;
 
-	queueDDText(getTextData(dd), getTextColor(dd), r2, str, false, false, _widgets[kDDRadiobuttonDefault]->_textAlignH, _widgets[dd]->_textAlignV);
+	queueDDText(getTextData(dd), getTextColor(dd), r2, str, true, false, _widgets[kDDRadiobuttonDefault]->_textAlignH, _widgets[dd]->_textAlignV);
 }
 
 void ThemeEngine::drawSlider(const Common::Rect &r, int width, WidgetStateInfo state) {


Commit: 00cc48f83dc28295fb4fb449b5c6ad64219e300a
    https://github.com/scummvm/scummvm/commit/00cc48f83dc28295fb4fb449b5c6ad64219e300a
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-01-29T07:26:20-08:00

Commit Message:
GUI: Add GNU FreeFont TTFs for use with our modern theme.

Changed paths:
  A COPYING.FREEFONT
  A gui/themes/fonts/FreeMonoBold.ttf
  A gui/themes/fonts/FreeSans.ttf
  A gui/themes/fonts/FreeSansBold.ttf
  A gui/themes/scummmodern/FreeMonoBold.ttf
  A gui/themes/scummmodern/FreeSans.ttf
  A gui/themes/scummmodern/FreeSansBold.ttf
    Makefile.common
    gui/themes/fonts/README
    gui/themes/scummmodern.zip
    gui/themes/scummmodern/scummmodern_gfx.stx
    ports.mk



diff --git a/COPYING.FREEFONT b/COPYING.FREEFONT
new file mode 100644
index 0000000..df44319
--- /dev/null
+++ b/COPYING.FREEFONT
@@ -0,0 +1,690 @@
+NOTE: This license file only applies to the GNU FreeFont files:
+"FreeSansBold.ttf", "FreeSans.ttf" and "FreeMonoBold.ttf" distributed along
+with our theme files.
+
+The following license applies with this exception:
+As a special exception, if you create a document which uses this font, and
+embed this font or unaltered portions of this font into the document, this
+font does not by itself cause the resulting document to be covered by the
+GNU General Public License. This exception does not however invalidate any
+other reasons why the document might be covered by the GNU General Public
+License. If you modify this font, you may extend this exception to your
+version of the font, but you are not obligated to do so.  If you do not
+wish to do so, delete this exception statement from your version.
+
+
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 3 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, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Makefile.common b/Makefile.common
index 1ec3f66..2aa3325 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -229,7 +229,7 @@ dist-src: \
 	@#DEB-src?
 
 # Common files
-DIST_FILES_DOCS:=$(addprefix $(srcdir)/,AUTHORS COPYING COPYING.BSD COPYING.LGPL COPYRIGHT NEWS README)
+DIST_FILES_DOCS:=$(addprefix $(srcdir)/,AUTHORS COPYING COPYING.BSD COPYING.LGPL COPYING.FREEFONT COPYRIGHT NEWS README)
 
 # Themes files
 DIST_FILES_THEMES=scummmodern.zip scummclassic.zip
diff --git a/gui/themes/fonts/FreeMonoBold.ttf b/gui/themes/fonts/FreeMonoBold.ttf
new file mode 100644
index 0000000..3bce612
Binary files /dev/null and b/gui/themes/fonts/FreeMonoBold.ttf differ
diff --git a/gui/themes/fonts/FreeSans.ttf b/gui/themes/fonts/FreeSans.ttf
new file mode 100644
index 0000000..9db9585
Binary files /dev/null and b/gui/themes/fonts/FreeSans.ttf differ
diff --git a/gui/themes/fonts/FreeSansBold.ttf b/gui/themes/fonts/FreeSansBold.ttf
new file mode 100644
index 0000000..63644e7
Binary files /dev/null and b/gui/themes/fonts/FreeSansBold.ttf differ
diff --git a/gui/themes/fonts/README b/gui/themes/fonts/README
index 594bfc3..b36d898 100644
--- a/gui/themes/fonts/README
+++ b/gui/themes/fonts/README
@@ -1,3 +1,5 @@
 These are fonts used in ScummVM. Most of them come from Xorg.
 
+The GNU FreeFont files are distributed under the license in COPYING.FREEFONT.
+
 Also other potentially usable fonts are stored here as well.
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index d829e4a..f56e4e9 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/FreeMonoBold.ttf b/gui/themes/scummmodern/FreeMonoBold.ttf
new file mode 100644
index 0000000..3bce612
Binary files /dev/null and b/gui/themes/scummmodern/FreeMonoBold.ttf differ
diff --git a/gui/themes/scummmodern/FreeSans.ttf b/gui/themes/scummmodern/FreeSans.ttf
new file mode 100644
index 0000000..9db9585
Binary files /dev/null and b/gui/themes/scummmodern/FreeSans.ttf differ
diff --git a/gui/themes/scummmodern/FreeSansBold.ttf b/gui/themes/scummmodern/FreeSansBold.ttf
new file mode 100644
index 0000000..63644e7
Binary files /dev/null and b/gui/themes/scummmodern/FreeSansBold.ttf differ
diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx
index cb9f9fd..af444be 100644
--- a/gui/themes/scummmodern/scummmodern_gfx.stx
+++ b/gui/themes/scummmodern/scummmodern_gfx.stx
@@ -105,27 +105,38 @@
 	<fonts>
 		<font	id = 'text_default'
 				file = 'helvb12.bdf'
+				scalable_file = 'FreeSansBold.ttf'
 		/>
 		<font	resolution = 'y<400'
 		   		id = 'text_default'
 				file = 'clR6x12.bdf'
+				scalable_file = 'FreeSans.ttf'
+				point_size = '11'
 		/>
 		<font	id = 'text_button'
 				file = 'helvb12.bdf'
+				scalable_file = 'FreeSansBold.ttf'
 		/>
 		<font	resolution = 'y<400'
 		   		id = 'text_button'
 				file = 'clR6x12.bdf'
+				scalable_file = 'FreeSans.ttf'
+				point_size = '11'
 		/>
 		<font	id = 'text_normal'
 				file = 'helvb12.bdf'
+				scalable_file = 'FreeSansBold.ttf'
 		/>
 		<font	resolution = 'y<400'
 		   		id = 'text_normal'
 				file = 'clR6x12.bdf'
+				scalable_file = 'FreeSans.ttf'
+				point_size = '11'
 		/>
 		<font	id = 'tooltip_normal'
 				file = 'fixed5x8.bdf'
+				scalable_file = 'FreeMonoBold.ttf'
+				point_size = '8'
 		/>
 
 		<text_color	id = 'color_normal'
diff --git a/ports.mk b/ports.mk
index 10b92bc..419b915 100644
--- a/ports.mk
+++ b/ports.mk
@@ -215,6 +215,7 @@ endif
 	cp $(srcdir)/AUTHORS $(WIN32PATH)/AUTHORS.txt
 	cp $(srcdir)/COPYING $(WIN32PATH)/COPYING.txt
 	cp $(srcdir)/COPYING.LGPL $(WIN32PATH)/COPYING.LGPL.txt
+	cp $(srcdir)/COPYING.FREEFONT $(WIN32PATH)/COPYING.FREEFONT.txt
 	cp $(srcdir)/COPYRIGHT $(WIN32PATH)/COPYRIGHT.txt
 	cp $(srcdir)/NEWS $(WIN32PATH)/NEWS.txt
 	cp $(srcdir)/doc/cz/PrectiMe $(WIN32PATH)/doc/cz/PrectiMe.txt


Commit: f11b52a097912cfc24728259150c00227167df38
    https://github.com/scummvm/scummvm/commit/f11b52a097912cfc24728259150c00227167df38
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-01-29T07:26:20-08:00

Commit Message:
KYRA: Prevent unnecessary removal of const in some casts.

Changed paths:
    engines/kyra/gui_eob.cpp
    engines/kyra/staticres_eob.cpp



diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 611eab1..5c2c3e5 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -3781,7 +3781,7 @@ void GUI_EoB::drawMenuButton(Button *b, bool clicked, bool highlight, bool noFil
 	if (!b)
 		return;
 
-	EoBMenuButtonDef *d = (EoBMenuButtonDef *)b->extButtonDef;
+	const EoBMenuButtonDef *d = (const EoBMenuButtonDef *)b->extButtonDef;
 
 	if (d->flags & 1)
 		drawMenuButtonBox(b->x, b->y, b->width, b->height, clicked, noFill);
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index ce43d22..638a185 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -369,13 +369,13 @@ void EoBCoreEngine::initStaticResource() {
 	_mnWord = _staticres->loadStrings(kEoBBaseManWord, _mnNumWord);
 	_mnPrompt = _staticres->loadStrings(kEoBBaseManPrompt, temp);
 
-	_monsterStepTable0 = (int8 *)_staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEoBBaseMonsterStepTable02 : kEoBBaseMonsterStepTable01, temp);
-	_monsterStepTable1 = (int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable1, temp);
-	_monsterStepTable2 = (int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable2, temp);
-	_monsterStepTable3 = (int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable3, temp);
+	_monsterStepTable0 = (const int8 *)_staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEoBBaseMonsterStepTable02 : kEoBBaseMonsterStepTable01, temp);
+	_monsterStepTable1 = (const int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable1, temp);
+	_monsterStepTable2 = (const int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable2, temp);
+	_monsterStepTable3 = (const int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable3, temp);
 	_monsterCloseAttPosTable1 = _staticres->loadRawData(kEoBBaseMonsterCloseAttPosTable1, temp);
 	_monsterCloseAttPosTable2 = _staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEoBBaseMonsterCloseAttPosTable22 : kEoBBaseMonsterCloseAttPosTable21, temp);
-	_monsterCloseAttUnkTable = (int8 *)_staticres->loadRawData(kEoBBaseMonsterCloseAttUnkTable, temp);
+	_monsterCloseAttUnkTable = (const int8 *)_staticres->loadRawData(kEoBBaseMonsterCloseAttUnkTable, temp);
 	_monsterCloseAttChkTable1 = _staticres->loadRawData(kEoBBaseMonsterCloseAttChkTable1, temp);
 	_monsterCloseAttChkTable2 = _staticres->loadRawData(kEoBBaseMonsterCloseAttChkTable2, temp);
 	_monsterCloseAttDstTable1 = _staticres->loadRawData(kEoBBaseMonsterCloseAttDstTable1, temp);






More information about the Scummvm-git-logs mailing list