[Scummvm-cvs-logs] SF.net SVN: scummvm:[52108] scummvm/branches/gsoc2010-opengl

vgvgf at users.sourceforge.net vgvgf at users.sourceforge.net
Mon Aug 16 02:21:09 CEST 2010


Revision: 52108
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52108&view=rev
Author:   vgvgf
Date:     2010-08-16 00:21:07 +0000 (Mon, 16 Aug 2010)

Log Message:
-----------
Merge trunk, from r51777 to r52105

Modified Paths:
--------------
    scummvm/branches/gsoc2010-opengl/COPYING.LGPL
    scummvm/branches/gsoc2010-opengl/Makefile
    scummvm/branches/gsoc2010-opengl/Makefile.common
    scummvm/branches/gsoc2010-opengl/NEWS
    scummvm/branches/gsoc2010-opengl/README
    scummvm/branches/gsoc2010-opengl/backends/fs/wii/wii-fs-factory.cpp
    scummvm/branches/gsoc2010-opengl/backends/platform/psp/mp3.cpp
    scummvm/branches/gsoc2010-opengl/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
    scummvm/branches/gsoc2010-opengl/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in
    scummvm/branches/gsoc2010-opengl/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
    scummvm/branches/gsoc2010-opengl/backends/platform/wii/main.cpp
    scummvm/branches/gsoc2010-opengl/backends/platform/wii/options.cpp
    scummvm/branches/gsoc2010-opengl/backends/platform/wii/osystem.h
    scummvm/branches/gsoc2010-opengl/backends/platform/wii/osystem_gfx.cpp
    scummvm/branches/gsoc2010-opengl/backends/platform/wii/osystem_sfx.cpp
    scummvm/branches/gsoc2010-opengl/base/internal_version.h
    scummvm/branches/gsoc2010-opengl/base/internal_version.h.in
    scummvm/branches/gsoc2010-opengl/base/plugins.cpp
    scummvm/branches/gsoc2010-opengl/base/version.cpp
    scummvm/branches/gsoc2010-opengl/common/macresman.cpp
    scummvm/branches/gsoc2010-opengl/common/macresman.h
    scummvm/branches/gsoc2010-opengl/common/messages.cpp
    scummvm/branches/gsoc2010-opengl/common/translation.cpp
    scummvm/branches/gsoc2010-opengl/common/util.cpp
    scummvm/branches/gsoc2010-opengl/common/util.h
    scummvm/branches/gsoc2010-opengl/configure
    scummvm/branches/gsoc2010-opengl/dists/engine-data/kyra.dat
    scummvm/branches/gsoc2010-opengl/dists/wii/meta.xml
    scummvm/branches/gsoc2010-opengl/engines/cine/anim.cpp
    scummvm/branches/gsoc2010-opengl/engines/cine/anim.h
    scummvm/branches/gsoc2010-opengl/engines/cine/bg_list.cpp
    scummvm/branches/gsoc2010-opengl/engines/cine/bg_list.h
    scummvm/branches/gsoc2010-opengl/engines/cine/cine.cpp
    scummvm/branches/gsoc2010-opengl/engines/cine/cine.h
    scummvm/branches/gsoc2010-opengl/engines/cine/gfx.cpp
    scummvm/branches/gsoc2010-opengl/engines/cine/main_loop.cpp
    scummvm/branches/gsoc2010-opengl/engines/cine/msg.cpp
    scummvm/branches/gsoc2010-opengl/engines/cine/msg.h
    scummvm/branches/gsoc2010-opengl/engines/cine/object.cpp
    scummvm/branches/gsoc2010-opengl/engines/cine/object.h
    scummvm/branches/gsoc2010-opengl/engines/cine/pal.cpp
    scummvm/branches/gsoc2010-opengl/engines/cine/pal.h
    scummvm/branches/gsoc2010-opengl/engines/cine/part.cpp
    scummvm/branches/gsoc2010-opengl/engines/cine/part.h
    scummvm/branches/gsoc2010-opengl/engines/cine/prc.cpp
    scummvm/branches/gsoc2010-opengl/engines/cine/prc.h
    scummvm/branches/gsoc2010-opengl/engines/cine/rel.cpp
    scummvm/branches/gsoc2010-opengl/engines/cine/rel.h
    scummvm/branches/gsoc2010-opengl/engines/cine/saveload.cpp
    scummvm/branches/gsoc2010-opengl/engines/cine/script.h
    scummvm/branches/gsoc2010-opengl/engines/cine/script_fw.cpp
    scummvm/branches/gsoc2010-opengl/engines/cine/script_os.cpp
    scummvm/branches/gsoc2010-opengl/engines/cine/various.cpp
    scummvm/branches/gsoc2010-opengl/engines/cine/various.h
    scummvm/branches/gsoc2010-opengl/engines/cruise/actor.cpp
    scummvm/branches/gsoc2010-opengl/engines/cruise/cruise.cpp
    scummvm/branches/gsoc2010-opengl/engines/cruise/cruise.h
    scummvm/branches/gsoc2010-opengl/engines/cruise/cruise_main.cpp
    scummvm/branches/gsoc2010-opengl/engines/cruise/ctp.cpp
    scummvm/branches/gsoc2010-opengl/engines/cruise/ctp.h
    scummvm/branches/gsoc2010-opengl/engines/cruise/gfxModule.cpp
    scummvm/branches/gsoc2010-opengl/engines/cruise/perso.cpp
    scummvm/branches/gsoc2010-opengl/engines/cruise/saveload.cpp
    scummvm/branches/gsoc2010-opengl/engines/cruise/script.cpp
    scummvm/branches/gsoc2010-opengl/engines/cruise/vars.cpp
    scummvm/branches/gsoc2010-opengl/engines/cruise/vars.h
    scummvm/branches/gsoc2010-opengl/engines/cruise/volume.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/demos/demoplayer.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/demos/demoplayer.h
    scummvm/branches/gsoc2010-opengl/engines/gob/draw.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/draw.h
    scummvm/branches/gsoc2010-opengl/engines/gob/draw_fascin.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/draw_playtoons.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/draw_v1.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/draw_v2.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/game.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/hotspots.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/hotspots.h
    scummvm/branches/gsoc2010-opengl/engines/gob/init.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/inter_bargon.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/inter_fascin.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/inter_playtoons.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/inter_v1.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/inter_v2.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/inter_v3.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/inter_v4.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/inter_v6.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/mult.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/mult_v1.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/mult_v2.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/scenery.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/totfile.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/videoplayer.cpp
    scummvm/branches/gsoc2010-opengl/engines/gob/videoplayer.h
    scummvm/branches/gsoc2010-opengl/engines/kyra/detection_tables.h
    scummvm/branches/gsoc2010-opengl/engines/kyra/lol.cpp
    scummvm/branches/gsoc2010-opengl/engines/kyra/lol.h
    scummvm/branches/gsoc2010-opengl/engines/kyra/sound_towns.cpp
    scummvm/branches/gsoc2010-opengl/engines/kyra/staticres.cpp
    scummvm/branches/gsoc2010-opengl/engines/kyra/staticres_lol.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/console.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/detection_tables.h
    scummvm/branches/gsoc2010-opengl/engines/sci/engine/kernel_tables.h
    scummvm/branches/gsoc2010-opengl/engines/sci/engine/kgraphics.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/engine/kmath.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/engine/kmovement.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/engine/kpathing.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/engine/kvideo.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/engine/savegame.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/engine/script.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/engine/script.h
    scummvm/branches/gsoc2010-opengl/engines/sci/engine/segment.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/engine/vm.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/engine/workarounds.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/engine/workarounds.h
    scummvm/branches/gsoc2010-opengl/engines/sci/graphics/animate.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/graphics/animate.h
    scummvm/branches/gsoc2010-opengl/engines/sci/graphics/compare.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/graphics/cursor.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/graphics/helpers.h
    scummvm/branches/gsoc2010-opengl/engines/sci/graphics/paint16.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/graphics/paint16.h
    scummvm/branches/gsoc2010-opengl/engines/sci/graphics/ports.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/graphics/ports.h
    scummvm/branches/gsoc2010-opengl/engines/sci/graphics/text16.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/graphics/view.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/module.mk
    scummvm/branches/gsoc2010-opengl/engines/sci/resource.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/sci.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/sound/midiparser_sci.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/sound/music.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/sound/music.h
    scummvm/branches/gsoc2010-opengl/engines/scumm/detection_tables.h
    scummvm/branches/gsoc2010-opengl/engines/scumm/script.cpp
    scummvm/branches/gsoc2010-opengl/engines/scumm/scumm.cpp
    scummvm/branches/gsoc2010-opengl/engines/scumm/scumm.h
    scummvm/branches/gsoc2010-opengl/engines/scumm/scumm_v5.h
    scummvm/branches/gsoc2010-opengl/engines/scumm/sound.cpp
    scummvm/branches/gsoc2010-opengl/engines/scumm/vars.cpp
    scummvm/branches/gsoc2010-opengl/graphics/module.mk
    scummvm/branches/gsoc2010-opengl/graphics/video/avi_decoder.cpp
    scummvm/branches/gsoc2010-opengl/graphics/video/codecs/cinepak.cpp
    scummvm/branches/gsoc2010-opengl/graphics/video/mpeg_player.cpp
    scummvm/branches/gsoc2010-opengl/gui/options.cpp
    scummvm/branches/gsoc2010-opengl/gui/widget.cpp
    scummvm/branches/gsoc2010-opengl/po/POTFILES
    scummvm/branches/gsoc2010-opengl/po/ca_ES.po
    scummvm/branches/gsoc2010-opengl/po/de_DE.po
    scummvm/branches/gsoc2010-opengl/po/es_ES.po
    scummvm/branches/gsoc2010-opengl/po/fr_FR.po
    scummvm/branches/gsoc2010-opengl/po/hu_HU.po
    scummvm/branches/gsoc2010-opengl/po/it_IT.po
    scummvm/branches/gsoc2010-opengl/po/ru_RU.po
    scummvm/branches/gsoc2010-opengl/po/scummvm.pot
    scummvm/branches/gsoc2010-opengl/po/uk_UA.po
    scummvm/branches/gsoc2010-opengl/sound/mididrv.cpp
    scummvm/branches/gsoc2010-opengl/sound/mididrv.h
    scummvm/branches/gsoc2010-opengl/sound/mods/paula.cpp
    scummvm/branches/gsoc2010-opengl/sound/module.mk
    scummvm/branches/gsoc2010-opengl/sound/softsynth/fmtowns_pc98/towns_audio.cpp
    scummvm/branches/gsoc2010-opengl/sound/softsynth/fmtowns_pc98/towns_audio.h
    scummvm/branches/gsoc2010-opengl/sound/softsynth/fmtowns_pc98/towns_euphony.cpp
    scummvm/branches/gsoc2010-opengl/sound/softsynth/fmtowns_pc98/towns_euphony.h
    scummvm/branches/gsoc2010-opengl/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
    scummvm/branches/gsoc2010-opengl/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h
    scummvm/branches/gsoc2010-opengl/sound/softsynth/sid.cpp
    scummvm/branches/gsoc2010-opengl/tools/create_kyradat/create_kyradat.cpp
    scummvm/branches/gsoc2010-opengl/tools/create_kyradat/games.cpp
    scummvm/branches/gsoc2010-opengl/tools/create_kyradat/tables.cpp

Added Paths:
-----------
    scummvm/branches/gsoc2010-opengl/COPYING.BSD
    scummvm/branches/gsoc2010-opengl/engines/sci/engine/script_patches.cpp
    scummvm/branches/gsoc2010-opengl/graphics/video/codecs/indeo3.cpp
    scummvm/branches/gsoc2010-opengl/graphics/video/codecs/indeo3.h
    scummvm/branches/gsoc2010-opengl/graphics/video/coktel_decoder.cpp
    scummvm/branches/gsoc2010-opengl/graphics/video/coktel_decoder.h
    scummvm/branches/gsoc2010-opengl/sound/softsynth/appleiigs.cpp

Removed Paths:
-------------
    scummvm/branches/gsoc2010-opengl/dists/devcpp/
    scummvm/branches/gsoc2010-opengl/engines/sci/video/vmd_decoder.cpp
    scummvm/branches/gsoc2010-opengl/engines/sci/video/vmd_decoder.h
    scummvm/branches/gsoc2010-opengl/graphics/video/coktelvideo/

Property Changed:
----------------
    scummvm/branches/gsoc2010-opengl/
    scummvm/branches/gsoc2010-opengl/engines/draci/script.cpp
    scummvm/branches/gsoc2010-opengl/engines/draci/script.h


Property changes on: scummvm/branches/gsoc2010-opengl
___________________________________________________________________
Modified: svn:mergeinfo
   - /scummvm/branches/gsoc2009-draci:41389-44325
/scummvm/trunk:49204-50837,50841-51493,51495-51775
   + /scummvm/branches/gsoc2009-draci:41389-44325
/scummvm/trunk:49204-50837,50841-51493,51495-51775,51777-52105

Copied: scummvm/branches/gsoc2010-opengl/COPYING.BSD (from rev 52105, scummvm/trunk/COPYING.BSD)
===================================================================
--- scummvm/branches/gsoc2010-opengl/COPYING.BSD	                        (rev 0)
+++ scummvm/branches/gsoc2010-opengl/COPYING.BSD	2010-08-16 00:21:07 UTC (rev 52108)
@@ -0,0 +1,93 @@
+NOTE: Only certain parts of the ScummVM project are under the BSD license.
+The majority of the files are under the GNU GPL. See the headers of the
+individual files to find out the exact license.
+
+The term "BSD license" refers to any BSD-like license, as they are sometimes
+hard to tell apart. No slight against other licenses is intended.
+
+
+Parts of the Nintendo DS port use the following license:
+
+Copyright (c) 2006 Michael "Chishm" Chisholm
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+  3. The name of the author may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+
+Parts of the MPEG decoder use the following license:
+
+Copyright (c) 1995 The Regents of the University of California.
+All rights reserved.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose, without fee, and without written agreement is
+hereby granted, provided that the above copyright notice and the following
+two paragraphs appear in all copies of this software.
+
+IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+Copyright (c) 1995 Erik Corry
+All rights reserved.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose, without fee, and without written agreement is
+hereby granted, provided that the above copyright notice and the following
+two paragraphs appear in all copies of this software.
+
+IN NO EVENT SHALL ERIK CORRY BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
+THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ERIK CORRY HAS BEEN ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ERIK CORRY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
+BASIS, AND ERIK CORRY HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
+UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+Portions of this software Copyright (c) 1995 Brown University.
+All rights reserved.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose, without fee, and without written agreement
+is hereby granted, provided that the above copyright notice and the
+following two paragraphs appear in all copies of this software.
+
+IN NO EVENT SHALL BROWN UNIVERSITY BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF BROWN
+UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+BROWN UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
+BASIS, AND BROWN UNIVERSITY HAS NO OBLIGATION TO PROVIDE MAINTENANCE,
+SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.

Modified: scummvm/branches/gsoc2010-opengl/COPYING.LGPL
===================================================================
--- scummvm/branches/gsoc2010-opengl/COPYING.LGPL	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/COPYING.LGPL	2010-08-16 00:21:07 UTC (rev 52108)
@@ -1,3 +1,9 @@
+NOTE: Only certain parts of the ScummVM project are under the GNU LGPL.
+The majority of the files are under the GNU GPL. See the headers of the
+individual files to find out the exact license.
+
+
+
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 

Modified: scummvm/branches/gsoc2010-opengl/Makefile
===================================================================
--- scummvm/branches/gsoc2010-opengl/Makefile	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/Makefile	2010-08-16 00:21:07 UTC (rev 52108)
@@ -42,6 +42,10 @@
 	CXXFLAGS+= -Wno-conversion -Wno-shorten-64-to-32 -Wno-sign-compare -Wno-four-char-constants
 endif
 
+# Warn if global constructors are used. Only available in GCC with LLVM backend
+# (and maybe clang?), hence off by default.
+#CXXFLAGS+= -Wglobal-constructors
+
 #######################################################################
 # Default commands - put the necessary replacements in config.mk      #
 #######################################################################

Modified: scummvm/branches/gsoc2010-opengl/Makefile.common
===================================================================
--- scummvm/branches/gsoc2010-opengl/Makefile.common	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/Makefile.common	2010-08-16 00:21:07 UTC (rev 52108)
@@ -172,12 +172,11 @@
 endif
 
 # Define the Subversion revision if available, either autodetected or
-# specified by the user
+# specified by the user, but only for base/version.cpp.
 ifneq ($(origin VER_SVNREV), undefined)
-CXXFLAGS+= -DSCUMMVM_SVN_REVISION=\"$(VER_SVNREV)\"
+base/version.o: CXXFLAGS:=$(CXXFLAGS) -DSCUMMVM_SVN_REVISION=\"$(VER_SVNREV)\"
 endif
 
-
 ######################################################################
 # Distribution settings
 ######################################################################
@@ -224,7 +223,7 @@
 	@#DEB-src?
 
 # Common files
-DIST_FILES_DOCS:=$(addprefix $(srcdir)/,AUTHORS COPYING COPYING.LGPL COPYRIGHT NEWS README)
+DIST_FILES_DOCS:=$(addprefix $(srcdir)/,AUTHORS COPYING COPYING.BSD COPYING.LGPL COPYRIGHT NEWS README)
 
 # Themes files
 DIST_FILES_THEMES:=$(addprefix $(srcdir)/gui/themes/,scummmodern.zip)

Modified: scummvm/branches/gsoc2010-opengl/NEWS
===================================================================
--- scummvm/branches/gsoc2010-opengl/NEWS	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/NEWS	2010-08-16 00:21:07 UTC (rev 52108)
@@ -49,6 +49,13 @@
    - Enabled playback of MP3 files using the hardware decoder (ME). This means that
      the port is now optimized for MP3 playback (as opposed to OGG).
 
+ Wii port:
+   - Added support for USB2 mass storage devices (requires The Homebrew Channel
+     >= v1.0.8 with IOS58).
+
+ GameCube port:
+   - Added support for DVDs with the ISO9660 file system.
+
 1.1.2 (????-??-??)
   Broken Sword 2
    - Fixed missing speech in some cutscenes.

Modified: scummvm/branches/gsoc2010-opengl/README
===================================================================
--- scummvm/branches/gsoc2010-opengl/README	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/README	2010-08-16 00:21:07 UTC (rev 52108)
@@ -1541,12 +1541,12 @@
 
 7.6) Playing sound with Sequencer MIDI:                          [UNIX ONLY]
 ---- ----------------------------------
-If your soundcard driver supports a sequencer, you may set the environment
-variable "SCUMMVM_MIDI" to your sequencer device -- for example, to
-/dev/sequencer
+If your soundcard driver supports a sequencer, you may set the
+environment variable "SCUMMVM_MIDI" to your sequencer device -- for
+example, to /dev/sequencer
 
-If you have problems with not hearing audio in this configuration, it is
-possible you will need to set the "SCUMMVM_MIDIPORT" variable to 1 or 2.
+If you have problems with not hearing audio in this configuration, you
+may need to set the environment variable "SCUMMVM_MIDIPORT" to 1 or 2.
 This selects the port on the selected sequencer to use. Then start
 scummvm with the -eseq parameter. This should work on several cards, and
 may offer better performance and quality than AdLib emulation. However,
@@ -1556,13 +1556,13 @@
 
 7.6.1) Playing sound with ALSA sequencer:                        [UNIX ONLY]
 ------ ----------------------------------
-If you have installed the ALSA driver with the sequencer support, then
-set the environment variable SCUMMVM_PORT or the config file parameter
-alsa_port to your sequencer port. The default is to try both "65:0" and
-"17:0".
+If you have installed the ALSA driver with sequencer support, then you
+may set the environment variable "SCUMMVM_PORT" or the config file
+variable "alsa_port" to specify your sequencer port. If neither is set,
+the default behavior is to try both "65:0" and "17:0".
 
-Here is a little howto on how to use the ALSA sequencer with your
-soundcard. In all cases, to have a list of all the sequencer ports you
+Here is a brief guide on how to use the ALSA sequencer with your
+soundcard. In all cases, to obtain a list of all the sequencer ports you
 have, try the command "aconnect -o -l". This should give output similar
 to:
 
@@ -1619,12 +1619,13 @@
 
 7.6.2) Playing sound with IRIX dmedia sequencer:                 [UNIX ONLY]
 ---- ------------------------------------------
-If you are using IRIX,  driver with the sequencer support, you can
-set the environment variable SCUMMVM_PORT or the config file parameter
-dmedia_port to your sequencer port. The default is to use the first port.
+If you are using IRIX and the dmedia driver with sequencer support, you
+can set the environment variable "SCUMMVM_MIDIPORT" or the config file
+variable "dmedia_port" to specify your sequencer port. The default is to
+use the first port.
 
-To get a list of configured midi interfaces on your system, run startmidi
-without parameters. Example output:
+To get a list of configured midi interfaces on your system, run
+"startmidi" without parameters. Example output:
 
   2 MIDI interfaces configured:
           Serial Port 2
@@ -1642,9 +1643,9 @@
 7.7) Using TiMidity++ MIDI server:
 ---- -----------------------------
 If you system lacks any MIDI sequencer, but you still want better MIDI
-quality than default AdLib emulation can offer, you can try TiMidity++
-MIDI server. See http://timidity.sourceforge.net/ for download and
-install instructions.
+quality than default AdLib emulation can offer, you can try the
+TiMidity++ MIDI server. See http://timidity.sourceforge.net/ for
+download and install instructions.
 
 First, you need to start a daemon:
 
@@ -1652,7 +1653,8 @@
 
 Now you can start scummvm and try selection TiMidity music output.  By
 default, it will connect to localhost:7777, but you can change host/port
-by defining "TIMIDITY_HOST" environment variable.
+via the "TIMIDITY_HOST" environment variable. You can also specify
+a "device number" using the "SCUMMVM_MIDIPORT" environment variable.
 
 
 7.8) Using compressed audio files

Modified: scummvm/branches/gsoc2010-opengl/backends/fs/wii/wii-fs-factory.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/fs/wii/wii-fs-factory.cpp	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/backends/fs/wii/wii-fs-factory.cpp	2010-08-16 00:21:07 UTC (rev 52108)
@@ -29,6 +29,7 @@
 
 #ifdef USE_WII_DI
 #include <di/di.h>
+#include <iso9660.h>
 #endif
 
 #ifdef USE_WII_SMB
@@ -71,8 +72,10 @@
 void WiiFilesystemFactory::asyncDeinit() {
 #ifdef USE_WII_DI
 	umount(kDVD);
+#ifndef GAMECUBE
 	DI_Close();
 #endif
+#endif
 #ifdef USE_WII_SMB
 	umount(kSMB);
 	net_deinit();
@@ -125,24 +128,11 @@
 			break;
 
 		printf("mount dvd\n");
-		DI_Mount();
-
-		while (DI_GetStatus() & DVD_INIT)
-			usleep(20 * 1000);
-
-		if (!(DI_GetStatus() & DVD_READY)) {
-			DI_StopMotor();
-			printf("error mounting dvd\n");
-			break;
-		}
-
-		printf("mount ISO9660\n");
 		if (ISO9660_Mount()) {
 			_dvdMounted = true;
 			_dvdError = false;
 			printf("ISO9660 mounted\n");
 		} else {
-			DI_StopMotor();
 			_dvdError = true;
 			printf("ISO9660 mount failed\n");
 		}
@@ -185,7 +175,6 @@
 		printf("umount dvd\n");
 
 		ISO9660_Unmount();
-		DI_StopMotor();
 
 		_dvdMounted = false;
 		_dvdError = false;
@@ -199,10 +188,7 @@
 
 		printf("umount smb\n");
 
-		if (smbClose("smb:"))
-			printf("smb umounted\n");
-		else
-			printf("error umounting smb\n");
+		smbClose("smb:");
 
 		_smbMounted = false;
 		_smbError = false;

Modified: scummvm/branches/gsoc2010-opengl/backends/platform/psp/mp3.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/psp/mp3.cpp	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/psp/mp3.cpp	2010-08-16 00:21:07 UTC (rev 52108)
@@ -213,7 +213,6 @@
 
 bool Mp3PspStream::initStreamME() {
 	// The following will eventually go into the thread
-	sceAudiocodecReleaseEDRAM(_codecParams);	// do we need this?
 
 	memset(_codecParams, 0, sizeof(_codecParams));
 	

Modified: scummvm/branches/gsoc2010-opengl/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/symbian/BuildPackageUpload_AllVersions.pl	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/symbian/BuildPackageUpload_AllVersions.pl	2010-08-16 00:21:07 UTC (rev 52108)
@@ -61,6 +61,7 @@
 $ExtraMacros =  "MACRO		NONSTANDARD_PORT\n";
 $ExtraMacros .=  "MACRO		ENABLE_VKEYBD\n";
 $ExtraMacros .= "MACRO		DISABLE_FANCY_THEMES\n";
+$ExtraMacros .= "MACRO		USE_TRANSLATION\n";
 
 # prep nice list of SDKs
 #while( ($SDK, $RootDir) = each(%SDK_RootDirs) )

Modified: scummvm/branches/gsoc2010-opengl/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in	2010-08-16 00:21:07 UTC (rev 52108)
@@ -109,10 +109,11 @@
 
 //STOP_AUTO_OBJECTS_BASE_//
 
-SOURCEPATH ..\..\..\..\
+SOURCEPATH ..\..\..\..
 
 // backend EPOC/SDL/ESDL specific includes
 SOURCE backends\platform\sdl\hardwarekeys.cpp
+SOURCE backends\platform\sdl\hardwarekeys.cpp
 SOURCE backends\platform\sdl\sdl.cpp
 SOURCE backends\fs\symbian\symbian-fs-factory.cpp
 SOURCE backends\platform\symbian\src\SymbianOS.cpp

Modified: scummvm/branches/gsoc2010-opengl/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in	2010-08-16 00:21:07 UTC (rev 52108)
@@ -110,10 +110,11 @@
 
 //STOP_AUTO_OBJECTS_BASE_//
 
-SOURCEPATH ..\..\..\..\
+SOURCEPATH ..\..\..\..
 
 // backend EPOC/SDL/ESDL specific includes
 SOURCE backends\platform\sdl\hardwarekeys.cpp
+SOURCE backends\platform\sdl\hardwarekeys.cpp
 SOURCE backends\platform\sdl\sdl.cpp
 SOURCE backends\fs\symbian\symbian-fs-factory.cpp
 SOURCE backends\platform\symbian\src\SymbianOS.cpp

Modified: scummvm/branches/gsoc2010-opengl/backends/platform/wii/main.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/wii/main.cpp	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/wii/main.cpp	2010-08-16 00:21:07 UTC (rev 52108)
@@ -37,8 +37,7 @@
 #ifdef DEBUG_WII_GDB
 #include <debug.h>
 #endif
-#include <gfx/gfx.h>
-#include <gfx/gfx_con.h>
+#include <gxflux/gfx_con.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -51,7 +50,6 @@
 #ifdef DEBUG_WII_GDB
 	printf("attach gdb now\n");
 	_break();
-	SYS_SetResetCallback(reset_cb);
 #else
 	reset_btn_pressed = true;
 #endif
@@ -78,6 +76,11 @@
 	for (i = 0; i < 60 * 3; ++i)
 		VIDEO_WaitVSync();
 
+#ifdef DEBUG_WII_GDB
+	printf("attach gdb now\n");
+	_break();
+#endif
+
 	printf("Press any key to continue.\n");
 
 	if (!gfx_frame_start())
@@ -157,12 +160,13 @@
 int main(int argc, char *argv[]) {
 	s32 res;
 
-#ifdef USE_WII_DI
+#if defined(USE_WII_DI) && !defined(GAMECUBE)
 	DI_Init();
 #endif
 
 	VIDEO_Init();
 	PAD_Init();
+	DSP_Init();
 	AUDIO_Init(NULL);
 
 	gfx_video_init(NULL);

Modified: scummvm/branches/gsoc2010-opengl/backends/platform/wii/options.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/wii/options.cpp	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/wii/options.cpp	2010-08-16 00:21:07 UTC (rev 52108)
@@ -22,7 +22,7 @@
 
 #include <errno.h>
 #include <network.h>
-#include <gfx/gfx.h>
+#include <gxflux/gfx.h>
 
 #include "common/config-manager.h"
 #include "gui/dialog.h"
@@ -133,11 +133,9 @@
 }
 
 void WiiOptionsDialog::handleTickle() {
-#ifndef GAMECUBE
 	WiiFilesystemFactory &fsf = WiiFilesystemFactory::instance();
 
 	int tab = _tab->getActiveTab();
-#endif
 
 #ifdef USE_WII_DI
 	if (tab == _tabDVD) {
@@ -198,9 +196,7 @@
 
 void WiiOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd,
 										uint32 data) {
-#ifndef GAMECUBE
 	WiiFilesystemFactory &fsf = WiiFilesystemFactory::instance();
-#endif
 
 	switch (cmd) {
 	case 'x':

Modified: scummvm/branches/gsoc2010-opengl/backends/platform/wii/osystem.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/wii/osystem.h	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/wii/osystem.h	2010-08-16 00:21:07 UTC (rev 52108)
@@ -26,7 +26,7 @@
 #include <gccore.h>
 #include <ogcsys.h>
 
-#include <gfx/gfx.h>
+#include <gxflux/gfx.h>
 
 #include "base/main.h"
 #include "common/fs.h"

Modified: scummvm/branches/gsoc2010-opengl/backends/platform/wii/osystem_gfx.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/wii/osystem_gfx.cpp	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/wii/osystem_gfx.cpp	2010-08-16 00:21:07 UTC (rev 52108)
@@ -21,8 +21,7 @@
 
 #include <malloc.h>
 
-#include <gfx/gfx.h>
-#include <gfx/gfx_con.h>
+#include <gxflux/gfx_con.h>
 
 #include "common/config-manager.h"
 #include "graphics/conversion.h"

Modified: scummvm/branches/gsoc2010-opengl/backends/platform/wii/osystem_sfx.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/wii/osystem_sfx.cpp	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/wii/osystem_sfx.cpp	2010-08-16 00:21:07 UTC (rev 52108)
@@ -25,7 +25,8 @@
 
 #define SFX_THREAD_STACKSIZE (1024 * 128)
 #define SFX_THREAD_PRIO 80
-#define SFX_THREAD_FRAG_SIZE 4096
+#define SFX_THREAD_FRAG_SIZE 2048
+#define SFX_BUFFERS 3
 
 static lwpq_t sfx_queue;
 static lwp_t sfx_thread;
@@ -33,20 +34,18 @@
 static bool sfx_thread_running = false;
 static bool sfx_thread_quit = false;
 
-static u8 sb = 0;
-static u8 *sound_buffer[2];
+static u32 sb_hw;
+static u8 *sound_buffer[SFX_BUFFERS];
 
 static void audio_switch_buffers() {
-	AUDIO_StopDMA();
-	AUDIO_InitDMA((u32) sound_buffer[sb], SFX_THREAD_FRAG_SIZE);
-	AUDIO_StartDMA();
-
+	sb_hw = (sb_hw + 1) % SFX_BUFFERS;
+	AUDIO_InitDMA((u32) sound_buffer[sb_hw], SFX_THREAD_FRAG_SIZE);
 	LWP_ThreadSignal(sfx_queue);
 }
 
 static void * sfx_thread_func(void *arg) {
 	Audio::MixerImpl *mixer = (Audio::MixerImpl *) arg;
-	u8 next_sb;
+	u8 sb_sw;
 
 	while (true) {
 		LWP_ThreadSleep(sfx_queue);
@@ -54,11 +53,15 @@
 		if (sfx_thread_quit)
 			break;
 
-		next_sb = sb ^ 1;
-		mixer->mixCallback(sound_buffer[next_sb], SFX_THREAD_FRAG_SIZE);
-		DCFlushRange(sound_buffer[next_sb], SFX_THREAD_FRAG_SIZE);
-
-		sb = next_sb;
+		// the hardware uses two buffers: a front and a back buffer
+		// we use 3 buffers here: two are beeing pushed to the DSP,
+		// and the free one is where our mixer writes to
+		// thus the latency of our steam is:
+		// 2048 [frag size] / 48000 / 2 [16bit] / 2 [stereo] * 2 [hw buffers]
+		// -> 21.3ms
+		sb_sw = (sb_hw + 1) % SFX_BUFFERS;
+		mixer->mixCallback(sound_buffer[sb_sw], SFX_THREAD_FRAG_SIZE);
+		DCFlushRange(sound_buffer[sb_sw], SFX_THREAD_FRAG_SIZE);
 	}
 
 	return NULL;
@@ -89,21 +92,20 @@
 		sfx_thread_running = true;
 	}
 
-	sound_buffer[0] = (u8 *) memalign(32, SFX_THREAD_FRAG_SIZE);
-	sound_buffer[1] = (u8 *) memalign(32, SFX_THREAD_FRAG_SIZE);
+	for (u32 i = 0; i < SFX_BUFFERS; ++i) {
+		sound_buffer[i] = (u8 *) memalign(32, SFX_THREAD_FRAG_SIZE);
+		memset(sound_buffer[i], 0, SFX_THREAD_FRAG_SIZE);
+		DCFlushRange(sound_buffer[i], SFX_THREAD_FRAG_SIZE);
+	}
 
-	memset(sound_buffer[0], 0, SFX_THREAD_FRAG_SIZE);
-	memset(sound_buffer[1], 0, SFX_THREAD_FRAG_SIZE);
+	_mixer->setReady(true);
 
-	DCFlushRange(sound_buffer[0], SFX_THREAD_FRAG_SIZE);
-	DCFlushRange(sound_buffer[1], SFX_THREAD_FRAG_SIZE);
+	sb_hw = 0;
 
-	_mixer->setReady(true);
-
 	AUDIO_SetDSPSampleRate(AI_SAMPLERATE_48KHZ);
 	AUDIO_RegisterDMACallback(audio_switch_buffers);
-
-	audio_switch_buffers();
+	AUDIO_InitDMA((u32) sound_buffer[sb_hw], SFX_THREAD_FRAG_SIZE);
+	AUDIO_StartDMA();
 }
 
 void OSystem_Wii::deinitSfx() {
@@ -123,8 +125,8 @@
 		free(sfx_stack);
 		sfx_thread_running = false;
 
-		free(sound_buffer[0]);
-		free(sound_buffer[1]);
+		for (u32 i = 0; i < SFX_BUFFERS; ++i)
+			free(sound_buffer[i]);
 	}
 }
 

Modified: scummvm/branches/gsoc2010-opengl/base/internal_version.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/base/internal_version.h	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/base/internal_version.h	2010-08-16 00:21:07 UTC (rev 52108)
@@ -1,3 +1,7 @@
+#ifndef INCLUDED_FROM_BASE_VERSION_CPP
+#error This file may only be included by base/version.cpp
+#endif
+
 #ifndef SCUMMVM_SVN_REVISION
 #define SCUMMVM_SVN_REVISION
 #endif

Modified: scummvm/branches/gsoc2010-opengl/base/internal_version.h.in
===================================================================
--- scummvm/branches/gsoc2010-opengl/base/internal_version.h.in	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/base/internal_version.h.in	2010-08-16 00:21:07 UTC (rev 52108)
@@ -1,3 +1,7 @@
+#ifndef INCLUDED_FROM_BASE_VERSION_CPP
+#error This file may only be included by base/version.cpp
+#endif
+
 #ifndef SCUMMVM_SVN_REVISION
 #define SCUMMVM_SVN_REVISION
 #endif

Modified: scummvm/branches/gsoc2010-opengl/base/plugins.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/base/plugins.cpp	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/base/plugins.cpp	2010-08-16 00:21:07 UTC (rev 52108)
@@ -200,6 +200,11 @@
 		LINK_PLUGIN(ADLIB)
 		LINK_PLUGIN(PCSPK)
 		LINK_PLUGIN(PCJR)
+		#ifndef DISABLE_SID
+		LINK_PLUGIN(C64)
+		#endif
+		LINK_PLUGIN(AMIGA)
+		LINK_PLUGIN(APPLEIIGS)
 		LINK_PLUGIN(TOWNS)
 		#if defined (UNIX)
 		LINK_PLUGIN(TIMIDITY)

Modified: scummvm/branches/gsoc2010-opengl/base/version.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/base/version.cpp	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/base/version.cpp	2010-08-16 00:21:07 UTC (rev 52108)
@@ -24,9 +24,11 @@
  */
 
 #include "common/scummsys.h"
-#include "base/internal_version.h"
 #include "base/version.h"
 
+#define INCLUDED_FROM_BASE_VERSION_CPP
+#include "base/internal_version.h"
+
 /*
  * Version string and build date string. These can be used by anything that
  * wants to display this information to the user (e.g. about dialog).

Modified: scummvm/branches/gsoc2010-opengl/common/macresman.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/common/macresman.cpp	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/common/macresman.cpp	2010-08-16 00:21:07 UTC (rev 52108)
@@ -557,6 +557,7 @@
 	*hotspot_y = dis.readUint16BE();
 	*hotspot_x = dis.readUint16BE();
 	*w = *h = 16;
+	*keycolor = 0xff;
 
 	// Use b/w cursor on backends which don't support cursor palettes
 	if (!colored)

Modified: scummvm/branches/gsoc2010-opengl/common/macresman.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/common/macresman.h	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/common/macresman.h	2010-08-16 00:21:07 UTC (rev 52108)
@@ -94,7 +94,7 @@
 	 *                The memory will be malloc()'ed
 	 * @param palSize Pointer to integer where the palette size will be stored.
 	 */
-	void convertCrsrCursor(byte *data, int datasize, byte **cursor, int *w, int *h,
+	static void convertCrsrCursor(byte *data, int datasize, byte **cursor, int *w, int *h,
 					  int *hotspot_x, int *hotspot_y, int *keycolor, bool colored, byte **palette, int *palSize);
 
 	/**

Modified: scummvm/branches/gsoc2010-opengl/common/messages.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/common/messages.cpp	2010-08-15 23:40:24 UTC (rev 52107)
+++ scummvm/branches/gsoc2010-opengl/common/messages.cpp	2010-08-16 00:21:07 UTC (rev 52108)
@@ -21,302 +21,305 @@
 	/* 17 */ "AdLib emulator:",
 	/* 18 */ "AdLib is used for music in many games",
 	/* 19 */ "Add Game...",
-	/* 20 */ "Antialiased Renderer (16bpp)",
-	/* 21 */ "Aspect ratio correction",
-	/* 22 */ "Associated key : %s",
-	/* 23 */ "Associated key : none",
-	/* 24 */ "Audio",
-	/* 25 */ "Autosave:",
-	/* 26 */ "Available engines:",
-	/* 27 */ "A~b~out...",
-	/* 28 */ "Bind Keys",
-	/* 29 */ "Both",
-	/* 30 */ "Brightness:",
-	/* 31 */ "Cancel",
-	/* 32 */ "Cannot create file",
-	/* 33 */ "Change game options",
-	/* 34 */ "Change global ScummVM options",
-	/* 35 */ "Check if you want to use your real hardware Roland-compatible sound device connected to your computer",
-	/* 36 */ "Choose",
-	/* 37 */ "Choose an action to map",
-	/* 38 */ "Clear value",
-	/* 39 */ "Close",
-	/* 40 */ "Correct aspect ratio for 320x200 games",
-	/* 41 */ "Could not find any engine capable of running the selected game",
-	/* 42 */ "Current video mode:",
-	/* 43 */ "Cursor Down",
-	/* 44 */ "Cursor Left",
-	/* 45 */ "Cursor Right",
-	/* 46 */ "Cursor Up",
-	/* 47 */ "DOSBox OPL emulator",
-	/* 48 */ "DVD",
-	/* 49 */ "DVD Mounted successfully",
-	/* 50 */ "DVD not mounted",
-	/* 51 */ "Date: ",
-	/* 52 */ "Debugger",
-	/* 53 */ "Default",
-	/* 54 */ "Delete",
-	/* 55 */ "Disable power off",
-	/* 56 */ "Disabled GFX",
-	/* 57 */ "Discovered %d new games ...",
-	/* 58 */ "Discovered %d new games.",
-	/* 59 */ "Display ",
-	/* 60 */ "Display keyboard",
-	/* 61 */ "Do you really want to delete this savegame?",
-	/* 62 */ "Do you really want to remove this game configuration?",
-	/* 63 */ "Do you really want to run the mass game detector? This could potentially add a huge number of games.",
-	/* 64 */ "Do you want to load or save the game?",
-	/* 65 */ "Do you want to perform an automatic scan ?",
-	/* 66 */ "Do you want to quit ?",
-	/* 67 */ "Double-strike",
-	/* 68 */ "Down",
-	/* 69 */ "Enable Roland GS Mode",
-	/* 70 */ "Engine does not support debug level '%s'",
-	/* 71 */ "English",
-	/* 72 */ "Error running game:",
-	/* 73 */ "Error while mounting the DVD",
-	/* 74 */ "Extra Path:",
-	/* 75 */ "FM Towns Emulator",
-	/* 76 */ "Fast mode",
-	/* 77 */ "Features compiled in:",
-	/* 78 */ "Free look",
-	/* 79 */ "Full title of the game",
-	/* 80 */ "Fullscreen mode",
-	/* 81 */ "GC Pad acceleration:",
-	/* 82 */ "GC Pad sensitivity:",
-	/* 83 */ "GFX",
-	/* 84 */ "GM Device:",
-	/* 85 */ "GUI Language:",
-	/* 86 */ "GUI Renderer:",
-	/* 87 */ "Game",
-	/* 88 */ "Game Data not found",
-	/* 89 */ "Game Id not supported",
-	/* 90 */ "Game Path:",
-	/* 91 */ "Global menu",
-	/* 92 */ "Go to previous directory level",
-	/* 93 */ "Go up",
-	/* 94 */ "Graphics",
-	/* 95 */ "Graphics mode:",
-	/* 96 */ "Hardware scale (fast, but low quality)",
-	/* 97 */ "Hercules Amber",
-	/* 98 */ "Hercules Green",
-	/* 99 */ "Hide Toolbar",
-	/* 100 */ "High quality audio (slower) (reboot)",
-	/* 101 */ "Higher value specifies better sound quality but may be not supported by your soundcard",
-	/* 102 */ "Hold Shift for Mass Add",
-	/* 103 */ "Horizontal underscan:",
-	/* 104 */ "IBM PCjr Emulator",
-	/* 105 */ "ID:",
-	/* 106 */ "Init network",
-	/* 107 */ "Initial top screen scale:",
-	/* 108 */ "Initialising MT-32 Emulator",
-	/* 109 */ "Initialising network",
-	/* 110 */ "Input",
-	/* 111 */ "Invalid Path",
-	/* 112 */ "Key mapper",
-	/* 113 */ "Keyboard",
-	/* 114 */ "Keymap:",
-	/* 115 */ "Keys",
-	/* 116 */ "Language of ScummVM GUI",
-	/* 117 */ "Language of the game. This will not turn your Spanish game version into English",
-	/* 118 */ "Language:",
-	/* 119 */ "Left",
-	/* 120 */ "Left Click",
-	/* 121 */ "Load",
-	/* 122 */ "Load game:",
-	/* 123 */ "Load savegame for selected game",
-	/* 124 */ "MAME OPL emulator",
-	/* 125 */ "MIDI",
-	/* 126 */ "MIDI gain:",
-	/* 127 */ "MT-32",
-	/* 128 */ "MT-32 Device:",
-	/* 129 */ "MT-32 Emulator",
-	/* 130 */ "Main screen scaling:",
-	/* 131 */ "Map",
-	/* 132 */ "Mass Add...",
-	/* 133 */ "Menu",
-	/* 134 */ "Misc",
-	/* 135 */ "Mixed AdLib/MIDI mode",
-	/* 136 */ "Mount DVD",
-	/* 137 */ "Mount SMB",
-	/* 138 */ "Mouse click",
-	/* 139 */ "Multi Function",
-	/* 140 */ "Music Device:",
-	/* 141 */ "Music volume:",
-	/* 142 */ "Mute All",
-	/* 143 */ "Name:",
-	/* 144 */ "Network down",
-	/* 145 */ "Network not initialsed (%d)",
-	/* 146 */ "Network up",
-	/* 147 */ "Network up, share mounted",
-	/* 148 */ "Never",
-	/* 149 */ "No",
-	/* 150 */ "No date saved",
-	/* 151 */ "No music",
-	/* 152 */ "No playtime saved",
-	/* 153 */ "No time saved",
-	/* 154 */ "None",
-	/* 155 */ "Normal (no scaling)",
-	/* 156 */ "OK",
-	/* 157 */ "Output rate:",
-	/* 158 */ "Override global MIDI settings",
-	/* 159 */ "Override global MT-32 settings",
-	/* 160 */ "Override global audio settings",
-	/* 161 */ "Override global graphic settings",
-	/* 162 */ "Override global volume settings",
-	/* 163 */ "PC Speaker Emulator",
-	/* 164 */ "Password:",
-	/* 165 */ "Path not a directory",
-	/* 166 */ "Path not a file",
-	/* 167 */ "Path not exists",
-	/* 168 */ "Paths",
-	/* 169 */ "Pause",
-	/* 170 */ "Pick the game:",
-	/* 171 */ "Platform the game was originally designed for",
-	/* 172 */ "Platform:",
-	/* 173 */ "Playtime: ",
-	/* 174 */ "Please select an action",
-	/* 175 */ "Plugins Path:",
-	/* 176 */ "Preferred Device:",
-	/* 177 */ "Press the key to associate",
-	/* 178 */ "Quit",
-	/* 179 */ "Quit ScummVM",
-	/* 180 */ "Read permission denied",
-	/* 181 */ "Reading failed",
-	/* 182 */ "Remap keys",
-	/* 183 */ "Remove game from the list. The game data files stay intact",
-	/* 184 */ "Render mode:",
-	/* 185 */ "Right",
-	/* 186 */ "Right Click",
-	/* 187 */ "Right click",
-	/* 188 */ "Rotate",
-	/* 189 */ "SFX volume:",
-	/* 190 */ "SMB",
-	/* 191 */ "Save",
-	/* 192 */ "Save Path:",
-	/* 193 */ "Save Path: ",
-	/* 194 */ "Save game:",
-	/* 195 */ "Scan complete!",
-	/* 196 */ "Scanned %d directories ...",
-	/* 197 */ "ScummVM Main Menu",
-	/* 198 */ "ScummVM could not find any engine capable of running the selected game!",
-	/* 199 */ "ScummVM could not find any game in the specified directory!",
-	/* 200 */ "ScummVM couldn't open the specified directory!",
-	/* 201 */ "Search in game list",
-	/* 202 */ "Search:",
-	/* 203 */ "Select SoundFont",
-	/* 204 */ "Select a Theme",
-	/* 205 */ "Select additional game directory",
-	/* 206 */ "Select an action and click 'Map'",
-	/* 207 */ "Select directory for GUI themes",
-	/* 208 */ "Select directory for extra files",
-	/* 209 */ "Select directory for plugins",
-	/* 210 */ "Select directory for saved games",
-	/* 211 */ "Select directory for savegames",
-	/* 212 */ "Select directory with game data",
-	/* 213 */ "Sensitivity",
-	/* 214 */ "Server:",
-	/* 215 */ "Share:",
-	/* 216 */ "Short game identifier used for referring to savegames and running the game from the command line",
-	/* 217 */ "Show Keyboard",
-	/* 218 */ "Show mouse cursor",
-	/* 219 */ "Show subtitles and play speech",
-	/* 220 */ "Show/Hide Cursor",
-	/* 221 */ "Skip",
-	/* 222 */ "Skip line",
-	/* 223 */ "Skip text",
-	/* 224 */ "Snap to edges",
-	/* 225 */ "Software scale (good quality, but slower)",
-	/* 226 */ "Sound on/off",
-	/* 227 */ "SoundFont is supported by some audio cards, Fluidsynth and Timidity",
-	/* 228 */ "SoundFont:",
-	/* 229 */ "Spch",
-	/* 230 */ "Special dithering modes supported by some games",
-	/* 231 */ "Special sound effects volume",
-	/* 232 */ "Specifies default sound device for General MIDI output",
-	/* 233 */ "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output",
-	/* 234 */ "Specifies output sound device or sound card emulator",
-	/* 235 */ "Specifies path to additional data used by all games or ScummVM",
-	/* 236 */ "Specifies path to additional data used the game",
-	/* 237 */ "Specifies preferred sound device or sound card emulator",
-	/* 238 */ "Specifies where your savegames are put",
-	/* 239 */ "Speech",
-	/* 240 */ "Speech volume:",
-	/* 241 */ "Standard Renderer (16bpp)",
-	/* 242 */ "Start selected game",
-	/* 243 */ "Status:",
-	/* 244 */ "Subs",
-	/* 245 */ "Subtitle speed:",
-	/* 246 */ "Subtitles",
-	/* 247 */ "Swap character",
-	/* 248 */ "Tap for left click, double tap right click",
-	/* 249 */ "Text and Speech:",
-	/* 250 */ "The chosen directory cannot be written to. Please select another one.",
-	/* 251 */ "Theme Path:",
-	/* 252 */ "Theme:",
-	/* 253 */ "This game ID is already taken. Please choose another one.",
-	/* 254 */ "This game does not support loading games from the launcher.",
-	/* 255 */ "Time: ",
-	/* 256 */ "Timeout while initialising network",
-	/* 257 */ "Touch X Offset",
-	/* 258 */ "Touch Y Offset",
-	/* 259 */ "Touchpad mode disabled.",
-	/* 260 */ "Touchpad mode enabled.",
-	/* 261 */ "True Roland MT-32 (disable GM emulation)",
-	/* 262 */ "Turns off General MIDI mapping for games with Roland MT-32 soundtrack",
-	/* 263 */ "Unknown",
-	/* 264 */ "Unknown Error",
-	/* 265 */ "Unmount DVD",
-	/* 266 */ "Unmount SMB",
-	/* 267 */ "Unscaled (you must scroll left and right)",
-	/* 268 */ "Unsupported Color Mode",
-	/* 269 */ "Untitled savestate",
-	/* 270 */ "Up",
-	/* 271 */ "Use both MIDI and AdLib sound generation",
-	/* 272 */ "Use laptop trackpad-style cursor control",
-	/* 273 */ "Username:",
-	/* 274 */ "Using SDL driver ",
-	/* 275 */ "Vertical underscan:",
-	/* 276 */ "Video",
-	/* 277 */ "Virtual keyboard",
-	/* 278 */ "Volume",
-	/* 279 */ "Windows MIDI",
-	/* 280 */ "Write permission denied",
-	/* 281 */ "Writing data failed",
-	/* 282 */ "Yes",
-	/* 283 */ "You have to restart ScummVM to take the effect.",
-	/* 284 */ "Zone",
-	/* 285 */ "Zoom down",
-	/* 286 */ "Zoom up",
-	/* 287 */ "every 10 mins",
-	/* 288 */ "every 15 mins",
-	/* 289 */ "every 30 mins",
-	/* 290 */ "every 5 mins",
-	/* 291 */ "~A~bout",
-	/* 292 */ "~A~dd Game...",
-	/* 293 */ "~C~ancel",
-	/* 294 */ "~C~lose",
-	/* 295 */ "~E~dit Game...",
-	/* 296 */ "~H~elp",
-	/* 297 */ "~I~ndy fight controls",
-	/* 298 */ "~K~eys",
-	/* 299 */ "~L~eft handed mode",
-	/* 300 */ "~L~oad",
-	/* 301 */ "~L~oad...",
-	/* 302 */ "~N~ext",
-	/* 303 */ "~O~K",
-	/* 304 */ "~O~ptions",
-	/* 305 */ "~O~ptions...",
-	/* 306 */ "~P~revious",
-	/* 307 */ "~Q~uit",
-	/* 308 */ "~R~emove Game",
-	/* 309 */ "~R~esume",
-	/* 310 */ "~R~eturn to Launcher",
-	/* 311 */ "~S~ave",
-	/* 312 */ "~S~tart",
-	/* 313 */ "~T~ransitions Enabled",
-	/* 314 */ "~W~ater Effect Enabled",
-	/* 315 */ "~Z~ip Mode Activated",
+	/* 20 */ "Amiga Audio Emulator",
+	/* 21 */ "Antialiased Renderer (16bpp)",
+	/* 22 */ "Apple II GS Emulator (NOT IMPLEMENTED)",
+	/* 23 */ "Aspect ratio correction",
+	/* 24 */ "Associated key : %s",
+	/* 25 */ "Associated key : none",
+	/* 26 */ "Audio",
+	/* 27 */ "Autosave:",
+	/* 28 */ "Available engines:",
+	/* 29 */ "A~b~out...",
+	/* 30 */ "Bind Keys",
+	/* 31 */ "Both",
+	/* 32 */ "Brightness:",
+	/* 33 */ "C64 Audio Emulator",
+	/* 34 */ "Cancel",
+	/* 35 */ "Cannot create file",
+	/* 36 */ "Change game options",
+	/* 37 */ "Change global ScummVM options",
+	/* 38 */ "Check if you want to use your real hardware Roland-compatible sound device connected to your computer",
+	/* 39 */ "Choose",
+	/* 40 */ "Choose an action to map",
+	/* 41 */ "Clear value",
+	/* 42 */ "Close",
+	/* 43 */ "Correct aspect ratio for 320x200 games",
+	/* 44 */ "Could not find any engine capable of running the selected game",
+	/* 45 */ "Current video mode:",
+	/* 46 */ "Cursor Down",
+	/* 47 */ "Cursor Left",
+	/* 48 */ "Cursor Right",
+	/* 49 */ "Cursor Up",
+	/* 50 */ "DOSBox OPL emulator",
+	/* 51 */ "DVD",
+	/* 52 */ "DVD Mounted successfully",
+	/* 53 */ "DVD not mounted",
+	/* 54 */ "Date: ",
+	/* 55 */ "Debugger",
+	/* 56 */ "Default",
+	/* 57 */ "Delete",
+	/* 58 */ "Disable power off",
+	/* 59 */ "Disabled GFX",
+	/* 60 */ "Discovered %d new games ...",
+	/* 61 */ "Discovered %d new games.",
+	/* 62 */ "Display ",
+	/* 63 */ "Display keyboard",
+	/* 64 */ "Do you really want to delete this savegame?",
+	/* 65 */ "Do you really want to remove this game configuration?",
+	/* 66 */ "Do you really want to run the mass game detector? This could potentially add a huge number of games.",
+	/* 67 */ "Do you want to load or save the game?",
+	/* 68 */ "Do you want to perform an automatic scan ?",
+	/* 69 */ "Do you want to quit ?",
+	/* 70 */ "Double-strike",
+	/* 71 */ "Down",
+	/* 72 */ "Enable Roland GS Mode",
+	/* 73 */ "Engine does not support debug level '%s'",
+	/* 74 */ "English",
+	/* 75 */ "Error running game:",
+	/* 76 */ "Error while mounting the DVD",
+	/* 77 */ "Extra Path:",
+	/* 78 */ "FM Towns Emulator",
+	/* 79 */ "Fast mode",
+	/* 80 */ "Features compiled in:",
+	/* 81 */ "Free look",
+	/* 82 */ "Full title of the game",
+	/* 83 */ "Fullscreen mode",
+	/* 84 */ "GC Pad acceleration:",
+	/* 85 */ "GC Pad sensitivity:",
+	/* 86 */ "GFX",
+	/* 87 */ "GM Device:",
+	/* 88 */ "GUI Language:",
+	/* 89 */ "GUI Renderer:",
+	/* 90 */ "Game",
+	/* 91 */ "Game Data not found",
+	/* 92 */ "Game Id not supported",
+	/* 93 */ "Game Path:",
+	/* 94 */ "Global menu",
+	/* 95 */ "Go to previous directory level",
+	/* 96 */ "Go up",
+	/* 97 */ "Graphics",
+	/* 98 */ "Graphics mode:",
+	/* 99 */ "Hardware scale (fast, but low quality)",
+	/* 100 */ "Hercules Amber",
+	/* 101 */ "Hercules Green",
+	/* 102 */ "Hide Toolbar",
+	/* 103 */ "High quality audio (slower) (reboot)",
+	/* 104 */ "Higher value specifies better sound quality but may be not supported by your soundcard",
+	/* 105 */ "Hold Shift for Mass Add",
+	/* 106 */ "Horizontal underscan:",
+	/* 107 */ "IBM PCjr Emulator",
+	/* 108 */ "ID:",
+	/* 109 */ "Init network",
+	/* 110 */ "Initial top screen scale:",
+	/* 111 */ "Initialising MT-32 Emulator",
+	/* 112 */ "Initialising network",
+	/* 113 */ "Input",
+	/* 114 */ "Invalid Path",
+	/* 115 */ "Key mapper",
+	/* 116 */ "Keyboard",
+	/* 117 */ "Keymap:",
+	/* 118 */ "Keys",
+	/* 119 */ "Language of ScummVM GUI",
+	/* 120 */ "Language of the game. This will not turn your Spanish game version into English",
+	/* 121 */ "Language:",
+	/* 122 */ "Left",
+	/* 123 */ "Left Click",
+	/* 124 */ "Load",
+	/* 125 */ "Load game:",
+	/* 126 */ "Load savegame for selected game",
+	/* 127 */ "MAME OPL emulator",
+	/* 128 */ "MIDI",
+	/* 129 */ "MIDI gain:",
+	/* 130 */ "MT-32",
+	/* 131 */ "MT-32 Device:",
+	/* 132 */ "MT-32 Emulator",
+	/* 133 */ "Main screen scaling:",
+	/* 134 */ "Map",
+	/* 135 */ "Mass Add...",
+	/* 136 */ "Menu",
+	/* 137 */ "Misc",
+	/* 138 */ "Mixed AdLib/MIDI mode",
+	/* 139 */ "Mount DVD",
+	/* 140 */ "Mount SMB",
+	/* 141 */ "Mouse click",
+	/* 142 */ "Multi Function",
+	/* 143 */ "Music Device:",
+	/* 144 */ "Music volume:",
+	/* 145 */ "Mute All",
+	/* 146 */ "Name:",
+	/* 147 */ "Network down",
+	/* 148 */ "Network not initialsed (%d)",
+	/* 149 */ "Network up",
+	/* 150 */ "Network up, share mounted",
+	/* 151 */ "Never",
+	/* 152 */ "No",
+	/* 153 */ "No date saved",
+	/* 154 */ "No music",
+	/* 155 */ "No playtime saved",
+	/* 156 */ "No time saved",
+	/* 157 */ "None",
+	/* 158 */ "Normal (no scaling)",
+	/* 159 */ "OK",
+	/* 160 */ "Output rate:",
+	/* 161 */ "Override global MIDI settings",
+	/* 162 */ "Override global MT-32 settings",
+	/* 163 */ "Override global audio settings",
+	/* 164 */ "Override global graphic settings",
+	/* 165 */ "Override global volume settings",
+	/* 166 */ "PC Speaker Emulator",
+	/* 167 */ "Password:",
+	/* 168 */ "Path not a directory",
+	/* 169 */ "Path not a file",
+	/* 170 */ "Path not exists",
+	/* 171 */ "Paths",
+	/* 172 */ "Pause",
+	/* 173 */ "Pick the game:",
+	/* 174 */ "Platform the game was originally designed for",
+	/* 175 */ "Platform:",
+	/* 176 */ "Playtime: ",
+	/* 177 */ "Please select an action",
+	/* 178 */ "Plugins Path:",
+	/* 179 */ "Preferred Device:",
+	/* 180 */ "Press the key to associate",
+	/* 181 */ "Quit",
+	/* 182 */ "Quit ScummVM",
+	/* 183 */ "Read permission denied",
+	/* 184 */ "Reading failed",
+	/* 185 */ "Remap keys",
+	/* 186 */ "Remove game from the list. The game data files stay intact",
+	/* 187 */ "Render mode:",
+	/* 188 */ "Right",
+	/* 189 */ "Right Click",
+	/* 190 */ "Right click",
+	/* 191 */ "Rotate",
+	/* 192 */ "SFX volume:",
+	/* 193 */ "SMB",
+	/* 194 */ "Save",
+	/* 195 */ "Save Path:",
+	/* 196 */ "Save Path: ",
+	/* 197 */ "Save game:",
+	/* 198 */ "Scan complete!",
+	/* 199 */ "Scanned %d directories ...",
+	/* 200 */ "ScummVM Main Menu",
+	/* 201 */ "ScummVM could not find any engine capable of running the selected game!",
+	/* 202 */ "ScummVM could not find any game in the specified directory!",
+	/* 203 */ "ScummVM couldn't open the specified directory!",
+	/* 204 */ "Search in game list",
+	/* 205 */ "Search:",
+	/* 206 */ "Select SoundFont",
+	/* 207 */ "Select a Theme",
+	/* 208 */ "Select additional game directory",
+	/* 209 */ "Select an action and click 'Map'",
+	/* 210 */ "Select directory for GUI themes",
+	/* 211 */ "Select directory for extra files",
+	/* 212 */ "Select directory for plugins",
+	/* 213 */ "Select directory for saved games",
+	/* 214 */ "Select directory for savegames",
+	/* 215 */ "Select directory with game data",
+	/* 216 */ "Sensitivity",
+	/* 217 */ "Server:",
+	/* 218 */ "Share:",
+	/* 219 */ "Short game identifier used for referring to savegames and running the game from the command line",
+	/* 220 */ "Show Keyboard",
+	/* 221 */ "Show mouse cursor",
+	/* 222 */ "Show subtitles and play speech",
+	/* 223 */ "Show/Hide Cursor",
+	/* 224 */ "Skip",
+	/* 225 */ "Skip line",
+	/* 226 */ "Skip text",
+	/* 227 */ "Snap to edges",
+	/* 228 */ "Software scale (good quality, but slower)",
+	/* 229 */ "Sound on/off",
+	/* 230 */ "SoundFont is supported by some audio cards, Fluidsynth and Timidity",
+	/* 231 */ "SoundFont:",
+	/* 232 */ "Spch",
+	/* 233 */ "Special dithering modes supported by some games",
+	/* 234 */ "Special sound effects volume",
+	/* 235 */ "Specifies default sound device for General MIDI output",
+	/* 236 */ "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output",
+	/* 237 */ "Specifies output sound device or sound card emulator",
+	/* 238 */ "Specifies path to additional data used by all games or ScummVM",
+	/* 239 */ "Specifies path to additional data used the game",
+	/* 240 */ "Specifies preferred sound device or sound card emulator",
+	/* 241 */ "Specifies where your savegames are put",
+	/* 242 */ "Speech",
+	/* 243 */ "Speech volume:",
+	/* 244 */ "Standard Renderer (16bpp)",
+	/* 245 */ "Start selected game",
+	/* 246 */ "Status:",
+	/* 247 */ "Subs",
+	/* 248 */ "Subtitle speed:",
+	/* 249 */ "Subtitles",
+	/* 250 */ "Swap character",
+	/* 251 */ "Tap for left click, double tap right click",
+	/* 252 */ "Text and Speech:",
+	/* 253 */ "The chosen directory cannot be written to. Please select another one.",
+	/* 254 */ "Theme Path:",
+	/* 255 */ "Theme:",
+	/* 256 */ "This game ID is already taken. Please choose another one.",
+	/* 257 */ "This game does not support loading games from the launcher.",
+	/* 258 */ "Time: ",
+	/* 259 */ "Timeout while initialising network",
+	/* 260 */ "Touch X Offset",
+	/* 261 */ "Touch Y Offset",
+	/* 262 */ "Touchpad mode disabled.",
+	/* 263 */ "Touchpad mode enabled.",
+	/* 264 */ "True Roland MT-32 (disable GM emulation)",
+	/* 265 */ "Turns off General MIDI mapping for games with Roland MT-32 soundtrack",
+	/* 266 */ "Unknown",
+	/* 267 */ "Unknown Error",
+	/* 268 */ "Unmount DVD",
+	/* 269 */ "Unmount SMB",
+	/* 270 */ "Unscaled (you must scroll left and right)",
+	/* 271 */ "Unsupported Color Mode",
+	/* 272 */ "Untitled savestate",
+	/* 273 */ "Up",
+	/* 274 */ "Use both MIDI and AdLib sound generation",
+	/* 275 */ "Use laptop trackpad-style cursor control",
+	/* 276 */ "Username:",
+	/* 277 */ "Using SDL driver ",
+	/* 278 */ "Vertical underscan:",
+	/* 279 */ "Video",
+	/* 280 */ "Virtual keyboard",
+	/* 281 */ "Volume",
+	/* 282 */ "Windows MIDI",
+	/* 283 */ "Write permission denied",
+	/* 284 */ "Writing data failed",
+	/* 285 */ "Yes",
+	/* 286 */ "You have to restart ScummVM to take the effect.",
+	/* 287 */ "Zone",
+	/* 288 */ "Zoom down",
+	/* 289 */ "Zoom up",
+	/* 290 */ "every 10 mins",
+	/* 291 */ "every 15 mins",
+	/* 292 */ "every 30 mins",
+	/* 293 */ "every 5 mins",
+	/* 294 */ "~A~bout",
+	/* 295 */ "~A~dd Game...",
+	/* 296 */ "~C~ancel",
+	/* 297 */ "~C~lose",
+	/* 298 */ "~E~dit Game...",
+	/* 299 */ "~H~elp",
+	/* 300 */ "~I~ndy fight controls",
+	/* 301 */ "~K~eys",
+	/* 302 */ "~L~eft handed mode",
+	/* 303 */ "~L~oad",
+	/* 304 */ "~L~oad...",
+	/* 305 */ "~N~ext",
+	/* 306 */ "~O~K",
+	/* 307 */ "~O~ptions",
+	/* 308 */ "~O~ptions...",
+	/* 309 */ "~P~revious",
+	/* 310 */ "~Q~uit",
+	/* 311 */ "~R~emove Game",
+	/* 312 */ "~R~esume",
+	/* 313 */ "~R~eturn to Launcher",
+	/* 314 */ "~S~ave",
+	/* 315 */ "~S~tart",
+	/* 316 */ "~T~ransitions Enabled",
+	/* 317 */ "~W~ater Effect Enabled",
+	/* 318 */ "~Z~ip Mode Activated",
 	NULL
 };
 
@@ -325,8 +328,645 @@
 	const char *msgstr;
 };
 
+static const PoMessageEntry _translation_ca_ES[] = {
+	{ 0, "Project-Id-Version: ScummVM 1.2.0svn\nReport-Msgid-Bugs-To: scummvm-devel at lists.sf.net\nPOT-Creation-Date: 2010-08-11 22:12+0100\nPO-Revision-Date: 2010-06-26 16:45+0100\nLast-Translator: Jordi Vilalta Prat <jvprat at gmail.com>\nLanguage-Team: Catalan <scummvm-devel at lists.sf.net>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=iso-8859-1\nContent-Transfer-Encoding: 8bit\nLanguage: Catalan\n" },
+	{ 2, " (Actiu)" },
+	{ 3, " (Joc)" },
+	{ 4, " (Global)" },
+	{ 5, "(compilat el %s)" },
+	{ 6, ", error al muntar la compartici\363" },
+	{ 7, ", compartici\363 no muntada" },
+	{ 8, "... progr\351s ..." },
+	{ 9, "11kHz" },
+	{ 10, "22 kHz" },
+	{ 11, "44 kHz" },
+	{ 12, "48 kHz" },
+	{ 13, "8 kHz" },
+	{ 14, "<per defecte>" },
+	{ 15, "Quant a ScummVM" },
+	{ 16, "Emulador d'AdLib" },
+	{ 17, "Emulador d'AdLib:" },
+	{ 18, "AdLib s'utilitza per la m\372sica de molts jocs" },
+	{ 19, "Afegeix Joc..." },
+	{ 20, "Emulador d'AdLib" },
+	{ 21, "Pintat amb antialias (16bpp)" },
+	{ 23, "Correcci\363 del rati d'aspecte" },
+	{ 24, "Tecla associada : %s" },
+	{ 25, "Tecla associada : cap" },
+	{ 26, "\300udio" },
+	{ 27, "Desat autom\340tic:" },
+	{ 28, "Motors disponibles:" },
+	{ 29, "~Q~uant a..." },
+	{ 30, "Mapeja tecles" },
+	{ 31, "Ambd\363s" },
+	{ 32, "Brillantor:" },
+	{ 33, "Emulador d'AdLib" },
+	{ 34, "Cancel\267la" },
+	{ 35, "No s'ha pogut crear el fitxer" },
+	{ 36, "Canvia les opcions del joc" },
+	{ 37, "Canvia les opcions globals de ScummVM" },
+	{ 38, "Marqueu si voleu utilitzar el vostre dispositiu hardware real de so compatible amb Roland connectat al vostre ordinador" },
+	{ 39, "Escull" },
+	{ 40, "Sel\267leccioneu una acci\363 per mapejar" },
+	{ 41, "Neteja el valor" },
+	{ 42, "Tanca" },
+	{ 43, "Corregeix la relaci\363 d'aspecte per jocs de 320x200" },
+	{ 44, "No s'ha pogut trobar cap motor capa\347 d'executar el joc seleccionat" },
+	{ 45, "Mode de v\355deo actual:" },
+	{ 46, "Cursor Avall" },
+	{ 47, "Cursor Esquerra" },
+	{ 48, "Cursor Dreta" },
+	{ 49, "Cursor Amunt" },
+	{ 50, "Emulador OPL de DOSBox" },
+	{ 51, "DVD" },
+	{ 52, "El DVD s'ha muntat satisfact\362riament" },
+	{ 53, "El DVD no est\340 muntat" },
+	{ 54, "Data: " },
+	{ 55, "Depurador" },
+	{ 56, "Per defecte" },
+	{ 57, "Suprimeix" },
+	{ 58, "Desactiva l'apagat autom\340tic" },
+	{ 59, "GFX desactivats" },
+	{ 60, "S'han descobert %d jocs nous ..." },
+	{ 61, "S'han descobert %d jocs nous." },
+	{ 62, "Pantalla" },
+	{ 63, "Mostra el teclat" },
+	{ 64, "Realment voleu suprimir aquesta partida?" },
+	{ 65, "Realment voleu suprimir la configuraci\363 d'aquest joc?" },
+	{ 66, "Esteu segur que voleu executar el detector massiu de jocs? Aix\362 pot afegir una gran quantitat de jocs." },
+	{ 67, "Voleu carregar o desar el joc?" },
+	{ 68, "Voleu fer una cerca autom\340tica?" },
+	{ 69, "Vols sortir?" },
+	{ 71, "Avall" },
+	{ 72, "Activa el Mode Roland GS" },
+	{ 73, "El motor no suporta el nivell de depuraci\363 '%s'" },
+	{ 74, "Angl\350s" },
+	{ 75, "Error al executar el joc:" },
+	{ 76, "Error al muntar el DVD" },
+	{ 77, "Cam\355 Extra:" },
+	{ 78, "Emulador de FM Towns" },
+	{ 79, "Mode r\340pid" },
+	{ 80, "Caracter\355stiques compilades:" },
+	{ 81, "Vista lliure" },
+	{ 82, "T\355tol complet del joc" },
+	{ 83, "Mode pantalla completa" },
+	{ 84, "Acceleraci\363 del Pad GC:" },
+	{ 85, "Sensibilitat del Pad GC:" },
+	{ 86, "GFX" },
+	{ 87, "Dispositiu GM:" },
+	{ 88, "Idioma de la interf\355cie d'usuari:" },
+	{ 89, "Mode de pintat de la interf\355cie d'usuari:" },
+	{ 90, "Joc" },
+	{ 91, "No s'han trobat les dades del joc" },
+	{ 92, "Identificador de joc no suportat" },
+	{ 93, "Cam\355 del Joc:" },
+	{ 94, "Men\372 global" },
+	{ 95, "Torna al nivell de directoris anterior" },
+	{ 96, "Amunt" },
+	{ 97, "Gr\340fics" },
+	{ 98, "Mode gr\340fic:" },
+	{ 99, "Escalat per hardware (r\340pid, per\362 de baixa qualitat)" },
+	{ 100, "Hercules \300mbar" },
+	{ 101, "Hercules Verd" },
+	{ 102, "Oculta la barra d'eines" },
+	{ 103, "Alta qualitat d'\340udio (m\351s lent) (reiniciar)" },
+	{ 104, "Valors m\351s alts especifiquen millor qualitat de so per\362 pot ser que la vostra tarja de so no ho suporti" },
+	{ 105, "Mantingueu premut Shift per a l'Addici\363 Massiva" },
+	{ 107, "Emulador d'IBM PCjr" },
+	{ 108, "Identificador:" },
+	{ 109, "Inicia la xarxa" },
+	{ 110, "Escalat inicial de la pantalla superior:" },
+	{ 111, "Iniciant l'Emulador de MT-32" },
+	{ 112, "Iniciant la xarxa" },
+	{ 113, "Entrada" },
+	{ 114, "Cam\355 incorrecte" },
+	{ 115, "Mapejador de tecles" },
+	{ 116, "Teclat" },
+	{ 117, "Mapa de teclat:" },
+	{ 118, "Tecles" },
+	{ 119, "Idioma de la interf\355cie d'usuari de ScummVM" },
+	{ 120, "Idioma del joc. Aix\362 no convertir\340 la vostra versi\363 Espanyola del joc a Angl\350s" },
+	{ 121, "Idioma:" },
+	{ 122, "Esquerra" },
+	{ 123, "Clic esquerre" },
+	{ 124, "Carrega" },
+	{ 125, "Carrega partida:" },
+	{ 126, "Carrega una partida pel joc seleccionat" },
+	{ 127, "Emulador OPL de MAME" },
+	{ 128, "MIDI" },
+	{ 129, "Guany MIDI:" },
+	{ 131, "Dispositiu MT32:" },
+	{ 132, "Emulador de MT-32" },
+	{ 133, "Escalat de la pantalla principal:" },
+	{ 134, "Mapeja" },
+	{ 135, "Addici\363 Massiva..." },
+	{ 136, "Men\372" },
+	{ 137, "Misc" },
+	{ 138, "Mode combinat AdLib/MIDI" },
+	{ 139, "Munta el DVD" },
+	{ 140, "Munta SMB" },
+	{ 141, "Clic del ratol\355" },
+	{ 142, "Funci\363 M\372ltiple" },
+	{ 143, "Dispositiu GM:" },
+	{ 144, "Volum de la m\372sica:" },
+	{ 145, "Silenciar tot" },
+	{ 146, "Nom:" },
+	{ 147, "Xarxa inactiva" },
+	{ 148, "Xarxa no iniciada (%d)" },
+	{ 149, "Xarxa activa" },
+	{ 150, "Xarxa activa, compartici\363 muntada" },
+	{ 151, "Mai" },
+	{ 152, "No" },
+	{ 153, "No hi ha data desada" },
+	{ 154, "Sense m\372sica" },
+	{ 155, "No hi ha temps de joc desat" },
+	{ 156, "No hi ha hora desada" },
+	{ 157, "Cap" },
+	{ 158, "Normal (sense escalar)" },
+	{ 159, "D'acord" },
+	{ 160, "Freq\374\350ncia de sortida:" },
+	{ 161, "Fer canvis sobre les opcions globals de MIDI" },
+	{ 162, "Fer canvis sobre les opcions globals de MIDI" },
+	{ 163, "Fer canvis sobre les opcions globals d'\340udio" },
+	{ 164, "Fer canvis sobre les opcions globals de gr\340fics" },
+	{ 165, "Fer canvis sobre les opcions globals de volum" },
+	{ 166, "Emulador d'Altaveu de PC" },
+	{ 167, "Contrasenya:" },
+	{ 168, "El cam\355 no \351s un directori" },
+	{ 169, "El cam\355 no \351s un fitxer" },
+	{ 170, "El cam\355 no existeix" },
+	{ 171, "Camins" },
+	{ 172, "Pausa" },
+	{ 173, "Seleccioneu el joc:" },
+	{ 174, "Plataforma per la que el joc es va dissenyar originalment" },
+	{ 175, "Plataforma:" },
+	{ 176, "Temps de joc: " },
+	{ 177, "Seleccioneu una acci\363" },
+	{ 178, "Cam\355 dels connectors:" },
+	{ 179, "Dispositiu Preferit:" },
+	{ 180, "Premeu la tecla a associar" },
+	{ 181, "Surt" },
+	{ 182, "Surt de ScummVM" },
+	{ 183, "S'ha denegat el perm\355s de lectura" },
+	{ 184, "Ha fallat la lectura" },
+	{ 185, "Remapeja les tecles" },
+	{ 186, "Elimina un joc de la llista. Els fitxers de dades del joc es mantenen intactes" },
+	{ 187, "Mode de pintat:" },
+	{ 188, "Dreta" },
+	{ 189, "Clic dret" },
+	{ 190, "Clic dret" },
+	{ 191, "Rotar" },
+	{ 192, "Volum dels efectes:" },
+	{ 193, "SMB" },
+	{ 194, "Desa" },
+	{ 195, "Cam\355 de les Partides:" },
+	{ 196, "Cam\355 de les Partides: " },
+	{ 197, "Desa la partida:" },
+	{ 198, "S'ha acabat la cerca!" },
+	{ 199, "S'han cercat %d directoris ..." },
+	{ 200, "Men\372 Principal de ScummVM" },
+	{ 201, "ScummVM no ha pogut trobar cap motor capa\347 d'executar el joc seleccionat!" },
+	{ 202, "ScummVM no ha pogut trobar cap joc al directori especificat!" },
+	{ 203, "ScummVM no ha pogut obrir el directori especificat!" },
+	{ 204, "Cerca a la llista de jocs" },
+	{ 205, "Cerca:" },
+	{ 206, "Seleccioneu el fitxer SoundFont" },
+	{ 207, "Seleccioneu un Tema" },
+	{ 208, "Seleccioneu el directori addicional del joc" },
+	{ 209, "Seleccioneu una acci\363 i cliqueu 'Mapeja'" },
+	{ 210, "Seleccioneu el directori dels temes de la Interf\355cie d'Usuari" },
+	{ 211, "Seleccioneu el directori dels fitxers extra" },
+	{ 212, "Seleccioneu el directori dels connectors" },
+	{ 213, "Seleccioneu el directori de les partides desades" },
+	{ 214, "Seleccioneu el directori de les partides desades" },
+	{ 215, "Seleccioneu el directori amb les dades del joc" },
+	{ 216, "Sensibilitat" },
+	{ 217, "Servidor:" },
+	{ 218, "Compartici\363:" },
+	{ 219, "Identificador de joc curt utilitzat per referir-se a les partides i per executar el joc des de la l\355nia de comandes" },
+	{ 220, "Mostra el teclat" },
+	{ 221, "Mostra el cursor del ratol\355" },
+	{ 222, "Mostra els subt\355tols i reprodueix la veu" },
+	{ 223, "Mostra/Oculta el cursor" },
+	{ 224, "Salta" },
+	{ 225, "Salta la l\355nia" },
+	{ 226, "Salta el text" },
+	{ 228, "Escalat per software (bona qualitat, per\362 m\351s lent)" },
+	{ 229, "So engegat/parat" },
+	{ 230, "Algunes targes de so, Fluidsynth i Timidity suporten SoundFont" },
+	{ 231, "Fitxer SoundFont:" },
+	{ 232, "Veus" },
+	{ 233, "Modes de dispersi\363 especials suportats per alguns jocs" },
+	{ 234, "Volum dels sons d'efectes especials" },
+	{ 235, "Especifica el dispositiu de so per defecte per a la sortida General MIDI" },
+	{ 236, "Especifica el dispositiu de so per defecte per a la sortida de Roland MT-32/LAPC1/CM32l/CM64" },
+	{ 237, "Especifica el dispositiu de so o l'emulador de tarja de so de sortida" },
+	{ 238, "Especifica el cam\355 de les dades addicionals utilitzades per tots els jocs o pel ScummVM" },
+	{ 239, "Especifica el cam\355 de dades addicionals utilitzades pel joc" },
+	{ 240, "Especifica el dispositiu de so o l'emulador de tarja de so preferit" },
+	{ 241, "Especifica on es desaran les partides" },
+	{ 242, "Veus" },
+	{ 243, "Volum de la veu:" },
+	{ 244, "Pintat est\340ndard (16bpp)" },
+	{ 245, "Iniciant el joc seleccionat" },
+	{ 246, "Estat:" },
+	{ 247, "Subt" },
+	{ 248, "Velocitat dels subt\355tols:" },
+	{ 249, "Subt\355tols" },
+	{ 250, "Commuta el personatge" },
+	{ 251, "Toc per a clic esquerre, doble toc per a clic dret" },
+	{ 252, "Text i Veus:" },
+	{ 253, "No es pot escriure al directori seleccionat. Si us plau, escolliu-ne un altre." },
+	{ 254, "Cam\355 dels Temes:" },
+	{ 255, "Tema:" },
+	{ 256, "Aquest identificador de joc ja est\340 usat. Si us plau, trieu-ne un altre." },
+	{ 257, "Aquest joc no suporta la c\340rrega de partides des del llan\347ador." },
+	{ 258, "Hora: " },
+	{ 260, "Despla\347ament X del toc" },
+	{ 261, "Despla\347ament Y del toc" },
+	{ 262, "Mode Touchpad desactivat." },
+	{ 263, "Mode Touchpad activat." },
+	{ 264, "Roland MT-32 real (desactiva l'emulaci\363 GM)" },
+	{ 265, "Desactiva la conversi\363 General MIDI pels jocs que tenen banda sonora per a Roland MT-32" },
+	{ 266, "Desconegut" },
+	{ 267, "Error desconegut" },
+	{ 268, "Desmunta el DVD" },
+	{ 269, "Desmunta SMB" },
+	{ 270, "Sense escalar (haureu de despla\347ar-vos a esquerra i dreta)" },
+	{ 271, "Mode de color no suportat" },
+	{ 272, "Partida sense t\355tol" },
+	{ 273, "Amunt" },
+	{ 274, "Utilitza MIDI i la generaci\363 de so AdLib alhora" },
+	{ 275, "Utilitza el control del cursor a l'estil del trackpad dels port\340tils" },
+	{ 276, "Nom d'usuari:" },
+	{ 277, "Utilitzant el controlador SDL " },
+	{ 279, "V\355deo" },
+	{ 280, "Teclat virtual" },
+	{ 281, "Volum" },
+	{ 282, "MIDI de Windows" },
+	{ 283, "S'ha denegat el perm\355s d'escriptura" },
+	{ 284, "Ha fallat l'escriptura de dades" },
+	{ 285, "S\355" },
+	{ 286, "Heu de reiniciar ScummVM perqu\350 tots els canvis tingui efecte." },
+	{ 287, "Zona" },
+	{ 288, "Redueix" },
+	{ 289, "Amplia" },
+	{ 290, "cada 10 minuts" },
+	{ 291, "cada 15 minuts" },
+	{ 292, "cada 30 minuts" },
+	{ 293, "cada 5 minuts" },
+	{ 294, "~Q~uant a" },
+	{ 295, "~A~fegeix Joc..." },
+	{ 296, "~C~ancel\267la" },
+	{ 297, "~T~anca" },
+	{ 298, "~E~dita Joc..." },
+	{ 299, "~A~juda" },
+	{ 300, "Controls de lluita de l'~I~ndy" },
+	{ 301, "~T~ecles" },
+	{ 302, "Mode ~e~squerr\340" },
+	{ 303, "C~a~rrega" },
+	{ 304, "~C~arrega..." },
+	{ 305, "~S~eg\374ent" },
+	{ 306, "~D~'acord" },
+	{ 307, "~O~pcions" },
+	{ 308, "~O~pcions..." },
+	{ 309, "~A~nterior" },
+	{ 310, "~T~anca" },
+	{ 311, "~S~uprimeix Joc" },
+	{ 312, "~C~ontinua" },
+	{ 313, "~R~etorna al Llan\347ador" },
+	{ 314, "~D~esa" },
+	{ 315, "~I~nicia" },
+	{ 316, "~T~ransicions activades" },
+	{ 317, "~E~fecte de l'aigua activat" },
+	{ 318, "Mode ~Z~ip activat" },
+	{ -1, NULL }
+};
+
+static const PoMessageEntry _translation_uk_UA[] = {
+	{ 0, "Project-Id-Version: ScummVM VERSION\nReport-Msgid-Bugs-To: scummvm-devel at lists.sf.net\nPOT-Creation-Date: 2010-08-11 22:12+0100\nPO-Revision-Date: 2010-07-30 22:19+0100\nLast-Translator: Lubomyr Lisen\nLanguage-Team: Ukrainian\nMIME-Version: 1.0\nContent-Type: text/plain; charset=iso-8859-5\nContent-Transfer-Encoding: 8bit\nLanguage: Ukrainian\nPlural-Forms: nplurals=3;     plural=n%10==1 && n%100!=11 ? 0 :            n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" },
+	{ 1, "   \262\330 \343\337\325\322\335\325\335\366, \351\336 \345\336\347\325\342\325 \322\330\331\342\330?   " },
+	{ 2, " (\260\332\342\330\322\335\320)" },
+	{ 3, " (\246\323\340\330)" },
+	{ 4, " (\263\333\336\321\320\333\354\335\320)" },
+	{ 5, "(\327\366\321\340\320\335\330\331 %s)" },
+	{ 6, ", \337\336\334\330\333\332\320 \337\366\324 \347\320\341 \337\366\324\332\333\356\347\325\335\335\357 \337\320\337\332\330" },
+	{ 7, ", \337\320\337\332\320 \335\325 \337\366\324\332\333\356\347\325\335\320" },
+	{ 8, "... \337\336\350\343\332 ..." },
+	{ 9, "11 \332\263\346" },
+	{ 10, "22 \332\263\346" },
+	{ 11, "44 \332\263\346" },
+	{ 12, "48 \332\263\346" },
+	{ 13, "8 \332\263\346" },
+	{ 14, "<\327\320 \343\334\336\322\347\320\335\335\357\334>" },
+	{ 15, "\277\340\336 ScummVM" },
+	{ 16, "\265\334\343\333\357\342\336\340 AdLib" },
+	{ 17, "\265\334\343\333\357\342\336\340 AdLib:" },
+	{ 18, "\267\322\343\332\336\322\320 \332\320\340\342\320 AdLib \322\330\332\336\340\330\341\342\336\322\343\364\342\354\341\357 \321\320\323\320\342\354\334\320 \366\323\340\320\334\330" },
+	{ 19, "\264\336\324. \323\340\343..." },
+	{ 20, "\265\334\343\333\357\342\336\340 AdLib" },
+	{ 21, "\300\320\341\342\325\340\330\327\320\342\336\340 \327\366 \327\323\333\320\324\326\343\322\320\335\335\357\334 (16bpp)" },
+	{ 23, "\272\336\340\325\332\346\366\357 \341\337\366\322\322\366\324\335\336\350\325\335\335\357 \341\342\336\340\366\335" },
+	{ 24, "\277\340\330\327\335\320\347\325\335\320 \332\333\320\322\366\350\320 : %s" },
+	{ 25, "\277\340\330\327\335\320\347\325\335\320 \332\333\320\322\366\350\320 : \335\325\334\320\364" },
+	{ 26, "\260\343\324\366\336" },
+	{ 27, "\260\322\342\336\327\321\325\340\325\326\325\335\335\357:" },
+	{ 28, "\264\336\341\342\343\337\335\366 \324\322\330\326\332\330:" },
+	{ 29, "\277\340\336 \337~\340~\336\323\340\320\334\343..." },
+	{ 30, "\337\340\330\327\335\320\347\330\342\330 \332\333\320\322\366\350\366" },
+	{ 31, "\262\341\325" },
+	{ 32, "\317\341\332\340\320\322\366\341\342\354:" },
+	{ 33, "\265\334\343\333\357\342\336\340 AdLib" },
+	{ 34, "\262\366\324\334\366\335\320" },
+	{ 35, "\275\325 \334\336\326\343 \341\342\322\336\340\330\342\330 \344\320\331\333" },
+	{ 36, "\267\334\366\335\330\342\330 \336\337\346\366\367 \323\340\330" },
+	{ 37, "\267\334\366\335\330\342\330 \323\333\336\321\320\333\354\335\366 \336\337\346\366\367 ScummVM" },
+	{ 38, "\262\366\324\334\366\342\354\342\325, \357\332\351\336 \343 \322\320\341 \337\366\324\332\333\356\347\325\335\330\331 Roland-\341\343\334\366\341\335\330\331 \327\322\343\332\336\322\330\331 \337\340\330\341\342\340\366\331 \366 \322\330 \345\336\347\325\342\325 \331\336\323\336 \322\330\332\336\340\330\341\342\320\342\330" },
+	{ 39, "\262\330\321\340\320\342\330" },
+	{ 40, "\262\330\321\325\340\366\342\354 \324\366\356 \324\333\357 \337\340\330\327\335\320\347\325\335\335\357" },
+	{ 41, "\276\347\330\341\342\330\342\330 \327\335\320\347\325\335\335\357" },
+	{ 42, "\267\320\332\340\330\342\330" },
+	{ 43, "\272\336\340\330\323\343\322\320\342\330 \341\337\366\322\322\366\324\335\336\350\325\335\335\357 \341\342\336\340\366\335 \324\333\357 \366\323\336\340 \327 \323\340\320\344\366\332\336\356 320x200" },
+	{ 44, "\275\325 \334\336\326\343 \327\335\320\331\342\330 \324\322\330\326\336\332 \324\333\357 \327\320\337\343\341\332\343 \322\330\321\340\320\335\336\367 \323\340\330" },
+	{ 45, "\302\325\332\343\347\330\331 \322\366\324\325\336\340\325\326\330\334:" },
+	{ 46, "\272\343\340\341\336\340 \322\335\330\327" },
+	{ 47, "\272\343\340\341\336\340 \322\333\366\322\336" },
+	{ 48, "\272\343\340\341\336\340 \322\337\340\320\322\336" },
+	{ 49, "\272\343\340\341\336\340 \322\322\325\340\345" },
+	{ 50, "\265\334\343\333\357\342\336\340 DOSBox OPL" },
+	{ 51, "DVD" },
+	{ 52, "DVD \337\366\324\332\333\356\347\325\335\330\331 \343\341\337\366\350\335\336" },
+	{ 53, "DVD \335\325 \337\366\324\332\333\356\347\325\335\330\331" },
+	{ 54, "\264\320\342\320: " },
+	{ 55, "\262\366\324\333\320\324\347\330\332" },
+	{ 56, "\267\320 \343\334\336\322\347\320\335\335\357\334" },
+	{ 57, "\262\330\324\320\333\330\342\330" },
+	{ 58, "\267\320\321\336\340\336\335\330\342\330 \322\330\334\332\335\325\335\335\357" },
+	{ 59, "\261\325\327 \323\340\320\344\366\332\330" },
+	{ 60, "\267\335\320\331\324\325\335\336 %d \335\336\322\330\345 \366\323\336\340 ..." },
+	{ 61, "\267\335\320\331\324\325\335\336 %d \335\336\322\330\345 \366\323\336\340." },
+	{ 62, "\277\336\332\320\327\320\342\330 " },
+	{ 63, "\277\336\332\320\327\320\342\330 \332\333\320\322\366\320\342\343\340\343" },
+	{ 64, "\262\330 \324\366\331\341\335\336 \345\336\347\325\342\325 \322\330\324\320\333\330\342\330 \346\325 \327\321\325\340\325\326\325\335\335\357?" },
+	{ 65, "\262\330 \324\366\331\341\335\336 \345\336\347\325\342\325 \322\330\324\320\333\330\342\330 \343\341\342\320\335\336\322\332\330 \324\333\357 \346\366\364\367 \323\340\330?" },
+	{ 66, "\262\330 \324\366\331\341\335\336 \345\336\347\325\342\325 \327\320\337\343\341\342\330\342\330 \324\325\342\325\332\342\336\340 \343\341\366\345 \366\323\336\340? \306\325 \337\336\342\325\335\346\366\331\335\336 \334\336\326\325 \324\336\324\320\342\330 \322\325\333\330\332\343 \332\366\333\354\332\366\341\342\354 \366\323\336\340." },
+	{ 67, "\262\330 \345\336\347\325\342\325 \327\320\322\320\335\342\320\326\330\342\330 \320\321\336 \327\321\325\340\325\323\342\330 \323\340\343?" },
+	{ 68, "\262\330 \345\336\347\325\342\325 \327\324\366\331\341\335\330\342\330 \320\322\342\336\334\320\342\330\347\335\330\331 \337\336\350\343\332?" },
+	{ 69, "\262\330 \345\336\347\330\342\325 \322\330\331\342\330?" },
+	{ 70, "\277\336\324\322\366\331\335\330\331 \343\324\320\340" },
+	{ 71, "\262\335\330\327" },
+	{ 72, "\303\322\366\334\332\335\343\342\330 \340\325\326\330\334 Roland GS" },
+	{ 73, "\264\322\330\326\336\332 \335\325 \337\366\324\342\340\330\334\343\364 \340\366\322\325\335\354 \322\366\324\333\320\324\332\330 '%s'" },
+	{ 74, "English" },
+	{ 75, "\277\336\334\330\333\332\320 \327\320\337\343\341\332\343 \323\340\330:" },
+	{ 76, "\277\336\334\330\333\332\320 \337\366\324 \347\320\341 \337\366\324\332\333\356\347\325\335\335\357 DVD" },
+	{ 77, "\264\336\324. \350\333\357\345:" },
+	{ 78, "\265\334\343\333\357\342\336\340 FM Towns" },
+	{ 79, "\310\322\330\324\332\330\331 \340\325\326\330\334" },
+	{ 80, "\262\332\333\356\347\325\335\366 \322 \321\366\333\324 \336\337\346\366\367:" },
+	{ 81, "\262\366\333\354\335\330\331 \336\323\333\357\324" },
+	{ 82, "\277\336\322\335\320 \335\320\327\322\320 \323\340\330" },
+	{ 83, "\277\336\322\335\336\325\332\340\320\335\335\330\331 \340\325\326\330\334" },
+	{ 84, "\277\340\330\341\332\336\340\325\335\335\357 GC \337\320\324\343:" },
+	{ 85, "\307\343\342\333\330\322\366\341\342\354 GC \337\320\324\343:" },
+	{ 86, "\263\340\344" },
+	{ 87, "\277\340\330\341\342\340\366\331 GM:" },
+	{ 88, "\274\336\322\320 \366\335\342\325\340\344\325\331\341\343:" },
+	{ 89, "\300\320\341\342\325\340\330\327\320\342\336\340 GUI:" },
+	{ 90, "\263\340\320" },
+	{ 91, "\275\325\334\320\364 \344\320\331\333\366\322 \323\340\330" },
+	{ 92, "Game Id \335\325 \337\366\324\342\340\330\334\343\364\342\354\341\357" },
+	{ 93, "\310\333\357\345 \324\336 \323\340\330: " },
+	{ 94, "\263\333\336\321\320\333\354\335\325 \334\325\335\356" },
+	{ 95, "\277\325\340\325\331\342\330 \335\320 \337\320\337\332\343 \340\366\322\335\325\334 \322\330\351\325" },
+	{ 96, "\262\322\325\340\345" },
+	{ 97, "\263\340\320\344\366\332\320" },
+	{ 98, "\263\340\320\344\366\347\335\330\331 \340\325\326\330\334:" },
+	{ 99, "\305\320\340\324\322\320\340\335\336\325 \334\320\341\350\342\320\321\343\322\320\335\335\357 (\350\322\330\324\332\336, \320\333\325 \335\330\327\354\332\336\367 \357\332\336\341\342\366)" },
+	{ 100, "Hercules \317\335\342\320\340\335\330\331" },
+	{ 101, "Hercules \267\325\333\325\335\330\331" },
+	{ 102, "\267\320\345\336\322\320\342\330 \337\320\335\325\333\354 \366\335\341\342\340\343\334\325\335\342\366\322" },
+	{ 103, "\262\330\341\336\332\320 \357\332\366\341\342\354 \327\322\343\332\343 (\337\336\322\366\333\354\335\366\350\325) (\340\325\321\343\342)" },
+	{ 104, "\262\325\333\330\332\366 \327\335\320\347\325\335\335\357 \327\320\324\320\356\342\354 \332\340\320\351\343 \357\332\366\341\342\354 \327\322\343\332\343, \337\340\336\342\325 \322\336\335\330 \334\336\326\343\342\354 \335\325 \337\366\324\342\340\330\334\343\322\320\342\330\341\357 \322\320\350\336\356 \327\322\343\332\336\322\336\356 \332\320\340\342\336\356" },
+	{ 105, "\303\342\340\330\334\343\331\342\325 \332\333\320\322\366\350\343 Shift \324\333\357 \342\336\323\336, \351\336\321 \324\336\324\320\342\330 \324\325\332\366\333\354\332\320 \366\323\336\340" },
+	{ 106, "\263\336\340\330\327\336\335\342\320\333\354\335\330\331 underscan:" },
+	{ 107, "\265\334\343\333\357\342\336\340 IBM PCjr" },
+	{ 108, "ID:" },
+	{ 109, "\246\335\366\346\366\320\333\366\327\320\346\366\357 \334\325\340\325\326\366" },
+	{ 110, "\277\336\347\320\342\332\336\322\330\331 \334\320\341\350\342\320\321 \322\325\340\345\335\354\336\323\336 \325\332\340\320\335\343:" },
+	{ 111, "\275\320\341\342\340\336\356\356 \325\334\343\333\357\342\336\340 MT-32" },
+	{ 112, "\275\320\333\320\350\342\336\322\343\356 \334\325\340\325\326\343" },
+	{ 113, "\262\322\366\324" },
+	{ 114, "\275\325\337\340\320\322\330\333\354\335\330\331 \350\333\357\345" },
+	{ 115, "\277\340\330\327\335\320\347\325\335\335\357 \332\333\320\322\366\350" },
+	{ 116, "\272\333\320\322\366\320\342\343\340\320" },
+	{ 117, "\302\320\321\333\330\346\357 \332\333\320\322\366\350:" },
+	{ 118, "\272\333\320\322\366\350\366" },
+	{ 119, "\274\336\322\320 \323\340\320\344\366\347\335\336\323\336 \366\335\342\325\340\344\325\331\341\343 ScummVM" },
+	{ 120, "\274\336\322\320 \323\340\330. \267\334\366\335\320 \346\354\336\323\336 \337\320\340\320\334\325\342\340\343 \335\325 \337\325\340\325\342\322\336\340\330\342\354 \323\340\343 \335\320 \320\335\323\333\366\331\341\354\332\366\331 \322 \343\332\340\320\367\335\341\354\332\343" },
+	{ 121, "\274\336\322\320:" },
+	{ 122, "\262\333\366\322\336" },
+	{ 123, "\273\366\322\330\331 \332\333\366\332" },
+	{ 124, "\267\320\322\320\335\342\320\326\330\342\330" },
+	{ 125, "\267\320\322\320\335\342\320\326\330\342\330 \323\340\343:" },
+	{ 126, "\267\320\322\320\335\342\320\326\330\342\330 \327\321\325\340\325\326\325\335\335\357 \324\333\357 \322\330\321\340\320\335\336\367 \323\340\330" },
+	{ 127, "\265\334\343\333\357\342\336\340 MAME OPL:" },
+	{ 128, "MIDI" },
+	{ 129, "\277\336\341\330\333\325\335\335\357 MIDI:" },
+	{ 130, "MT-32" },
+	{ 131, "\277\340\330\341\342\340\366\331 MT-32:" },
+	{ 132, "\265\334\343\333\357\342\336\340 MT-32" },
+	{ 133, "\274\320\341\350\342\320\321 \323\336\333\336\322\335\336\323\336 \325\332\340\320\335\343:" },
+	{ 134, "\277\340\330\327\335\320\347\330\342\330" },
+	{ 135, "\264\336\324. \321\320\323\320\342\336..." },
+	{ 136, "\274\325\335\356" },
+	{ 137, "\300\366\327\335\325" },
+	{ 138, "\267\334\366\350\320\335\330\331 \340\325\326\330\334 AdLib/MIDI" },
+	{ 139, "\277\366\324\332\333\356\347\330\342\330 DVD" },
+	{ 140, "\277\366\324\332\333\356\347\330\342\330 SMB" },
+	{ 141, "\272\333\366\332 \334\330\350\332\336\356" },
+	{ 142, "\274\343\333\354\342\366\344\343\335\332\346\366\357" },
+	{ 143, "\274\343\327\330\347\335\330\331 \277\340\330\341\342\340\366\331:" },
+	{ 144, "\263\343\347\335\366\341\342\354 \334\343\327\330\332\330:" },
+	{ 145, "\262\330\334\332\335\343\342\330 \343\341\325" },
+	{ 146, "\275\320\327\322\320:" },
+	{ 147, "\274\325\340\325\326\320 \322\330\334\332\335\325\335\320" },
+	{ 148, "\274\325\340\325\326\320 \335\325 \335\320\333\320\323\336\324\326\325\335\320 (%d)" },
+	{ 149, "\274\325\340\325\326\320 \337\340\320\346\356\364" },
+	{ 150, "\274\325\340\325\326\320 \337\340\320\346\356\364, \337\320\337\332\320 \337\366\324\332\333\356\347\325\335\320" },
+	{ 151, "\275\366\332\336\333\330" },
+	{ 152, "\275\366" },
+	{ 153, "\264\320\342\320 \335\325 \327\320\337\330\341\320\335\320" },
+	{ 154, "\261\325\327 \334\343\327\330\332\330" },
+	{ 155, "\307\320\341 \323\340\330 \335\325 \327\320\337\330\341\320\335\336" },
+	{ 156, "\307\320\341 \335\325 \327\320\337\330\341\320\335\330\331" },
+	{ 157, "\275\325 \327\320\324\320\335\330\331" },
+	{ 158, "\261\325\327 \327\321\366\333\354\350\325\335\335\357" },
+	{ 159, "OK" },
+	{ 160, "\262\330\345\366\324\335\320 \347\320\341\342\336\342\320:" },
+	{ 161, "\277\325\340\325\332\340\330\342\330 \323\333\336\321\320\333\354\335\366 \343\341\342\320\335\336\322\332\330 MIDI" },
+	{ 162, "\277\325\340\325\332\340\330\342\330 \323\333\336\321\320\333\354\335\366 \343\341\342\320\335\336\322\332\330 MT-32" },
+	{ 163, "\277\325\340\325\332\340\330\342\330 \323\333\336\321\320\333\354\335\366 \343\341\342\320\335\336\322\332\330 \320\343\324\366\336" },
+	{ 164, "\277\325\340\325\332\340\330\342\330 \323\333\336\321\320\333\354\335\366 \343\341\342\320\335\336\322\332\330 \323\340\320\344\366\332\330" },
+	{ 165, "\277\325\340\325\332\340\330\342\330 \323\333\336\321\320\333\354\335\366 \343\341\342\320\335\336\322\332\330 \323\343\347\335\336\341\342\366" },
+	{ 166, "\265\334\343\333\357\342\336\340 PC \341\337\366\332\325\340\320" },
+	{ 167, "\277\320\340\336\333\354:" },
+	{ 168, "\310\333\357\345 \335\325 \364 \337\320\337\332\336\356" },
+	{ 169, "\310\333\357\345 \335\325 \364 \344\320\331\333\336\334" },
+	{ 170, "\310\333\357\345 \335\325 \327\335\320\331\324\325\335\330\331" },
+	{ 171, "\310\333\357\345\330" },
+	{ 172, "\277\320\343\327\320" },
+	{ 173, "\262\330\321\325\340\366\342\354 \323\340\343:" },
+	{ 174, "\277\333\320\342\344\336\340\334\320, \324\333\357 \357\332\336\367 \323\340\320 \321\343\333\320 \341\337\336\347\320\342\332\343 \340\336\327\340\336\321\333\325\335\320" },
+	{ 175, "\277\333\320\342\344\336\340\334\320:" },
+	{ 176, "\307\320\341 \323\340\330: " },
+	{ 177, "\261\343\324\354 \333\320\341\332\320, \322\330\321\325\340\366\342\354 \324\366\356" },
+	{ 178, "\310\333\357\345 \324\336 \337\333\320\323\366\335\366\322:" },
+	{ 179, "\277\340\330\341\342\340\366\331 \357\332\336\334\343 \322\366\324\324\320\364\342\354\341\357 \337\325\340\325\322\320\323\320:" },
+	{ 180, "\275\320\342\330\341\335\366\342\354 \332\333\320\322\366\350\343 \324\333\357 \337\340\330\327\335\320\347\325\335\335\357" },
+	{ 181, "\262\330\345\366\324" },
+	{ 182, "\262\330\345\366\324 \327 ScummVM" },
+	{ 183, "\275\325\324\336\341\342\320\342\335\354\336 \337\340\320\322 \324\333\357 \347\330\342\320\335\335\357" },
+	{ 184, "\277\336\334\330\333\332\320 \347\330\342\320\335\335\357" },
+	{ 185, "\277\325\340\325\337\340\330\327\335\320\347\330\342\330 \332\333\320\322\366\350\366" },
+	{ 186, "\262\330\324\320\333\330\342\330 \323\340\343 \327\366 \341\337\330\341\332\343. \275\325 \322\330\324\320\333\357\364 \323\340\343 \327 \326\336\340\341\342\332\336\323\336 \324\330\341\332\320" },
+	{ 187, "\300\325\326\330\334 \340\320\341\342\340\343\322\320\335\335\357:" },
+	{ 188, "\262\337\340\320\322\336" },
+	{ 189, "\277\340\320\322\330\331 \332\333\366\332" },
+	{ 190, "\277\340\320\322\330\331 \332\333\366\332" },
+	{ 191, "\277\336\322\325\340\335\343\342\330" },
+	{ 192, "\263\343\347\335\366\341\342\354 \325\344\325\332\342\366\322:" },
+	{ 193, "SMB" },
+	{ 194, "\267\320\337\330\341\320\342\330" },
+	{ 195, "\310\333\357\345 \327\321\325\340.: " },
+	{ 196, "\310\333\357\345 \324\333\357 \327\321\325\340\325\326\325\335\354: " },
+	{ 197, "\267\321\325\340\325\323\342\330 \323\340\343: " },
+	{ 198, "\277\336\350\343\332 \327\320\332\366\335\347\325\335\330\331!" },
+	{ 199, "\277\340\336\323\333\357\335\343\342\336 %d \337\320\337\336\332 ..." },
+	{ 200, "\263\336\333\336\322\335\325 \334\325\335\356 ScummVM" },
+	{ 201, "ScummVM \335\325 \327\334\366\323 \327\335\320\331\342\330 \324\322\330\326\336\332 \324\333\357 \327\320\337\343\341\332\343 \322\330\321\340\320\335\336\367 \323\340\330!" },
+	{ 202, "ScummVM \335\325 \334\336\326\325 \327\335\320\331\342\330 \323\340\343 \343 \322\332\320\327\320\335\366\331 \337\320\337\346\366!" },
+	{ 203, "ScummVM \335\325 \334\336\326\325 \322\366\324\332\340\330\342\330 \322\332\320\327\320\335\343 \337\320\337\332\343!" },
+	{ 204, "\277\336\350\343\332 \322 \341\337\330\341\332\343 \366\323\336\340" },
+	{ 205, "\277\336\350\343\332:" },
+	{ 206, "\262\330\321\325\340\366\342\354 SoundFont" },
+	{ 207, "\262\330\321\325\340\366\342\354 \342\325\334\343" },
+	{ 208, "\262\330\321\325\340\366\342\354 \324\336\324\320\342\332\336\322\343 \337\320\337\332\343 \323\340\330" },
+	{ 209, "\262\330\321\325\340\366\342\354 \324\366\356 \366 \332\333\366\332\335\366\342\354 '\277\340\330\327\335\320\347\330\342\330'" },
+	{ 210, "\262\330\321\325\340\366\342\354 \337\320\337\332\343 \324\333\357 \342\325\334 GUI" },
+	{ 211, "\262\330\321\325\340\366\342\354 \337\320\337\332\343 \327 \324\336\324\320\342\332\336\322\330\334\330 \344\320\331\333\320\334\330" },
+	{ 212, "\262\330\321\325\340\366\342\354 \337\320\337\332\343 \327 \337\333\320\323\330\335\320\334\330" },
+	{ 213, "\262\330\321\325\340\366\342\354 \337\320\337\332\343 \324\333\357 \327\321\325\340\325\326\325\335\354" },
+	{ 214, "\262\330\321\325\340\366\342\354 \337\320\337\332\343 \324\333\357 \327\321\325\340\325\326\325\335\354" },
+	{ 215, "\262\330\321\325\340\366\342\354 \337\320\337\332\343 \327 \344\320\331\333\320\334\330 \323\340\330" },
+	{ 216, "\307\343\342\333\330\322\366\341\342\354" },
+	{ 217, "\301\325\340\322\325\340:" },
+	{ 218, "\274\325\340\325\326\325\322\320 \337\320\337\332\320:" },
+	{ 219, "\272\336\340\336\342\332\330\331 \366\324\325\335\342\330\344\366\332\320\342\336\340, \357\332\330\331 \322\330\332\336\340\330\341\342\336\322\343\364\342\354\341\357 \324\333\357 \335\320\327\322 \327\321\325\340\325\326\325\335\330\345 \366\323\336\340 \366 \324\333\357 \327\320\337\343\341\332\343 \327 \332\336\334\320\335\324\335\336\367 \341\342\340\366\347\332\330" },
+	{ 220, "\277\336\332\320\327\320\342\330 \332\333\320\322\366\320\342\343\340\343" },
+	{ 221, "\277\336\332\320\327\343\322\320\342\330 \332\343\340\341\336\340 \334\330\350\366" },
+	{ 222, "\277\336\332\320\327\343\322\320\342\330 \341\343\321\342\330\342\340\330 \366 \322\366\324\342\322\336\340\356\322\320\342\330 \334\336\322\343" },
+	{ 223, "\277\336\332\320\327\320\342\330/\301\345\336\322\320\342\330 \332\343\340\341\336\340" },
+	{ 224, "\277\340\336\337\343\341\342\330\342\330" },
+	{ 225, "\277\340\336\337\343\341\342\330\342\330 \340\357\324\336\332" },
+	{ 226, "\277\340\336\337\343\341\342\330\342\330 \342\325\332\341\342" },
+	{ 227, "\277\340\330\332\340\366\337\330\342\330 \324\336 \332\340\320\367\322" },
+	{ 228, "\277\340\336\323\340\320\334\335\325 \334\320\341\350\342\320\321\343\322\320\335\335\357 (\345\336\340\336\350\320 \357\332\366\341\342\354, \320\333\325 \337\336\322\366\333\354\335\366\350\325)" },
+	{ 229, "\267\322\343\332 \343\322\366\334/\322\330\334\332" },
+	{ 230, "SoundFont \337\366\324\342\340\330\334\343\364\342\354\341\357 \324\325\357\332\330\334\330 \327\322\343\332\336\322\330\334\330 \332\320\340\342\320\334\330, Fluidsynth \366 Timidity" },
+	{ 231, "SoundFont:" },
+	{ 232, "\276\327\322" },
+	{ 233, "\301\337\325\346\366\320\333\354\335\366 \340\325\326\330\334\330 \340\325\335\324\325\340\330\335\323\343, \357\332\366 \337\366\324\342\340\330\334\343\356\342\354 \324\325\357\332\366 \366\323\340\330" },
+	{ 234, "\263\343\347\335\366\341\342\354 \341\337\325\346\366\320\333\354\335\330\345 \327\322\343\332\336\322\330\345 \325\344\325\332\342\366\322" },
+	{ 235, "\262\332\320\327\343\364 \322\330\345\366\324\335\330\331 \327\322\343\332\336\322\330\331 \337\340\330\341\342\340\366\331 \324\333\357 MIDI" },
+	{ 236, "\262\332\320\327\343\364 \327\322\343\332\336\322\330\331 \337\340\330\341\342\340\366\331 \337\336 \343\334\336\322\347\320\335\335\356 \324\333\357 \322\330\322\336\324\343 \335\320 Roland MT-32/LAPC1/CM32l/CM64" },
+	{ 237, "\262\332\320\327\343\364 \322\330\345\366\324\335\330\331 \327\322\343\332\336\322\330\331 \337\340\330\341\342\340\366\331 \320\321\336 \325\334\343\333\357\342\336\340 \327\322\343\332\336\322\336\367 \332\320\340\342\330" },
+	{ 238, "\262\332\320\327\343\364 \350\333\357\345 \324\336 \324\336\324\320\342\332\336\322\330\345 \344\320\331\333\366\322 \324\320\335\330\345, \322\330\332\336\340\330\341\342\336\322\343\322\320\335\330\345 \343\341\366\334\320 \366\323\340\320\334\330, \320\321\336 ScummVM" },
+	{ 239, "\262\332\320\327\343\364 \350\333\357\345 \324\336 \324\336\324\320\342\332\336\322\330\345 \344\320\331\333\366\322 \324\320\335\330\345 \324\333\357 \323\340\330" },
+	{ 240, "\262\332\320\327\343\364 \322\330\345\366\324\335\330\331 \327\322\343\332\336\322\330\331 \337\340\330\341\342\340\366\331 \320\321\336 \325\334\343\333\357\342\336\340 \327\322\343\332\336\322\336\367 \332\320\340\342\330" },
+	{ 241, "\262\332\320\327\343\364 \350\333\357\345 \324\336 \327\321\325\340\325\326\325\335\354 \323\340\330" },
+	{ 242, "\276\327\322\343\347\325\335\335\357" },
+	{ 243, "\263\343\347\335\366\341\342\354 \336\327\322\343\347\325\335\335\357:" },
+	{ 244, "\301\342\320\335\324\320\340\342\335\330\331 \340\320\341\342\325\340\330\327\320\342\336\340 (16bpp)" },
+	{ 245, "\267\320\337\343\341\342\330\342\330 \322\330\321\340\320\335\343 \323\340\343" },
+	{ 246, "\301\342\320\335:" },
+	{ 247, "\301\343\321" },
+	{ 248, "\310\322\330\324\332\366\341\342\354 \341\343\321\342\330\342\340\366\322:" },
+	{ 249, "\301\343\321\342\330\342\340\330" },
+	{ 250, "\267\334\366\335\330\342\330 \323\325\340\336\357" },
+	{ 251, "\302\320\337 \324\333\357 \333\366\322\336\323\336 \332\333\320\346\320\335\335\357, \337\336\324\322\366\331\335\330\331 \342\320\337 \324\333\357 \337\340\320\322\336\323\336 \332\333\320\346\320\335\335\357" },
+	{ 252, "\302\325\332\341\342 \366 \336\327\322\343\347\325\335\335\357:" },
+	{ 253, "\275\325 \334\336\326\343 \337\330\341\320\342\330 \343 \322\330\321\340\320\335\343 \337\320\337\332\343. \261\343\324\354 \333\320\341\332\320, \322\332\320\326\366\342\354 \366\335\350\343." },
+	{ 254, "\310\333\357\345 \324\336 \342\325\334:" },
+	{ 255, "\302\325\334\320:" },
+	{ 256, "\306\325\331 ID \323\340\330 \322\326\325 \322\330\332\336\340\330\341\342\336\322\343\364\342\354\341\357. \261\343\324\354 \333\320\341\332\320, \322\330\321\325\340\366\342\354 \366\335\350\330\331." },
+	{ 257, "\306\357 \323\340\320 \335\325 \337\366\324\342\340\330\334\343\364 \327\320\322\320\335\342\320\326\325\335\335\357 \327\321\325\340\325\326\325\335\354 \347\325\340\325\327 \323\336\333\336\322\335\325 \334\325\335\356." },
+	{ 258, "\307\320\341: " },
+	{ 259, "\307\320\341 \337\366\324\332\333\356\347\325\335\335\357 \324\336 \334\325\340\325\326\366 \322\330\342\366\332" },
+	{ 260, "\267\334\366\351\325\335\335\357 \342\336\340\332\320\335\354 \337\336 \336\341\366 X" },
+	{ 261, "\267\334\366\351\325\335\335\357 \342\336\340\332\320\335\354 \337\336 \336\341\366 Y" },
+	{ 262, "\300\325\326\330\334 \342\320\347\337\320\324\343 \322\330\334\332\335\325\335\330\331." },
+	{ 263, "\300\325\326\330\334 \342\320\347\337\320\324\343 \343\322\366\334\332\335\325\335\330\331." },
+	{ 264, "\301\337\340\320\322\326\335\366\331 Roland MT-32 (\322\330\334\332\335\343\342\330 \325\334\343\333\357\346\330\356 GM)" },
+	{ 265, "\262\330\334\330\332\320\364 \334\320\337\337\366\335\323 General MIDI \324\333\357 \366\323\336\340 \366\327 \327\322\343\332\336\322\336\356 \324\336\340\366\326\332\336\356 \324\333\357 Roland MT-32" },
+	{ 266, "\275\325\322\366\324\336\334\336" },
+	{ 267, "\275\325\322\366\324\336\334\320 \337\336\334\330\333\332\320" },
+	{ 268, "\262\366\324\332\333\356\347\330\342\330 DVD" },
+	{ 269, "\262\366\324\332\333\356\347\342\330 SMB" },
+	{ 270, "\261\325\327 \334\320\341\350\342\320\321\343\322\320\335\335\357 (\342\340\325\321\320 \321\343\324\325 \337\340\336\332\340\343\347\343\322\320\342\330 \335\320\333\366\322\336 \366 \335\320\337\340\320\322\336)" },
+	{ 271, "\300\325\326\330\334 \272\336\333\354\336\340\343 \335\325 \337\366\324\342\340\330\334\343\364\342\354\341\357" },
+	{ 272, "\267\321\325\340\325\326\325\335\335\357 \321\325\327 \366\334\325\335\366" },
+	{ 273, "\262\322\325\340\345" },
+	{ 274, "\262\330\332\336\340\330\341\342\336\322\343\322\320\342\330 \366 MIDI \366 AdLib \324\333\357 \323\325\335\325\340\320\346\366\367 \327\322\343\332\343" },
+	{ 275, "\262\330\332\336\340\330\341\342\336\322\343\322\320\342\330 \343\337\340\320\322\333\366\335\335\357 \332\343\340\341\336\340\336\334 \357\332 \335\320 \342\340\325\332\337\320\324\366 \333\320\337\342\336\337\366\322" },
+	{ 276, "\272\336\340\330\341\342\343\322\320\347:" },
+	{ 277, "\262\330\332\336\340\330\341\342\336\322\343\356 \324\340\320\331\322\325\340 SDL " },
+	{ 278, "\262\325\340\342\330\332\320\333\354\335\330\331 underscan:" },
+	{ 279, "\262\366\324\325\336" },
+	{ 280, "\262\366\340\342\343\320\333\354\335\320 \332\333\320\322\366\320\342\343\340\320" },
+	{ 281, "\263\343\347\335\366\341\342\354" },
+	{ 282, "Windows MIDI" },
+	{ 283, "\275\325\324\336\341\342\320\342\335\354\336 \337\340\320\322 \324\333\357 \327\320\337\330\341\343" },
+	{ 284, "\277\336\334\330\333\332\320 \327\320\337\330\341\343 \324\320\335\330\345" },
+	{ 285, "\302\320\332" },
+	{ 286, "\262\330 \337\336\322\330\335\335\366 \337\325\340\325\327\320\337\343\341\342\330\342\330 ScummVM \351\336\321 \327\320\341\342\336\341\343\322\320\342\330 \327\334\366\335\330." },
+	{ 287, "\267\336\335\320" },
+	{ 288, "\267\334\335\350. \334\320\350\342\320\321" },
+	{ 289, "\267\321\366\333. \334\320\350\342\320\321" },
+	{ 290, "\332\336\326\335\366 10 \345\322" },
+	{ 291, "\332\336\326\335\366 15 \345\322" },
+	{ 292, "\332\336\326\335\366 30 \345\322" },
+	{ 293, "\332\336\326\335\366 5 \345\322" },
+	{ 294, "\277\340\336 \337\340\336~\323~\340\320\334\343" },
+	{ 295, "~\264~\336\324. \323\340\343..." },
+	{ 296, "\262\366~\324~\334\366\335\320" },
+	{ 297, "~\267~\320\332\340\330\342\330" },
+	{ 298, "\300\325\324\320~\323~. \323\340\343..." },
+	{ 299, "~\264~\336\337\336\334\336\323\320" },
+	{ 300, "\272\325\340\343\322\320\335\335\357 \321\336\357\334\330 \322 Indy" },
+	{ 301, "~\272~\333\320\322\366\350\366" },
+	{ 302, "\273\366\322\336\340\343\332\330\331 \340\325\326\330\334" },
+	{ 303, "~\267~\320\322\320\335\342\320\326\330\342\330" },
+	{ 304, "~\267~\320\322\320\335..." },
+	{ 305, "~\275~\320\341\342" },
+	{ 306, "~O~K" },
+	{ 307, "~\276~\337\346\366\367" },
+	{ 308, "~\276~\337\346\366\367..." },
+	{ 309, "~\277~\336\337\325\340" },
+	{ 310, "~\262~\330\345\366\324" },
+	{ 311, "~\262~\330\324\320\333\330\342\330 \323\340\343" },
+	{ 312, "\277\340\336\324\336\322~\326~\330\342\330" },
+	{ 313, "~\277~\336\322\325\340\335\343\342\330\341\354 \322 \323\336\333\336\322\335\325 \334\325\335\356" },
+	{ 314, "~\267~\320\337\330\341\320\342\330" },
+	{ 315, "\267~\320~\337\343\341\332" },
+	{ 316, "\277\325\340\325\345\336\324\330 \320\332\342\330\322\336\322\320\335\366" },
+	{ 317, "\265\344\325\332\342\330 \322\336\324\330 \322\332\333\356\347\325\335\366" },
+	{ 318, "\300\325\326\330\334 \350\322\330\324\332\336\323\336 \337\325\340\325\345\336\324\343 \320\332\342\330\322\336\322\320\335\330\331" },
+	{ -1, NULL }
+};
+
 static const PoMessageEntry _translation_ru_RU[] = {
-	{ 0, "Project-Id-Version: ScummVM VERSION\nReport-Msgid-Bugs-To: scummvm-devel at lists.sf.net\nPOT-Creation-Date: 2010-07-30 22:14+0100\nPO-Revision-Date: 2010-06-13 20:55+0300\nLast-Translator: Eugene Sandulenko <sev at scummvm.org>\nLanguage-Team: Russian\nMIME-Version: 1.0\nContent-Type: text/plain; charset=iso-8859-5\nContent-Transfer-Encoding: 8bit\nLanguage: Russian\nPlural-Forms: nplurals=3;     plural=n%10==1 && n%100!=11 ? 0 :            n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" },
+	{ 0, "Project-Id-Version: ScummVM VERSION\nReport-Msgid-Bugs-To: scummvm-devel at li\nPOT-Creation-Date: 2010-08-13 12:49+0300\nPO-Revision-Date: 2010-06-13 20:55+0300\nLast-Translator: Eugene Sandulenko <sev at scummvm.org>\nLanguage-Team: Russian\nMIME-Version: 1.0\nContent-Type: text/plain; charset=iso-8859-5\nContent-Transfer-Encoding: 8bit\nLanguage: Russian\nPlural-Forms: nplurals=3;     plural=n%10==1 && n%100!=11 ? 0 :            n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" },
 	{ 1, "   \262\353 \343\322\325\340\325\335\353, \347\342\336 \345\336\342\330\342\325 \322\353\331\342\330?   " },
 	{ 2, " (\260\332\342\330\322\335\320\357)" },
 	{ 3, " (\270\323\340\353)" },
@@ -346,307 +986,693 @@
 	{ 17, "\315\334\343\333\357\342\336\340 AdLib:" },
 	{ 18, "\267\322\343\332\336\322\320\357 \332\320\340\342\320 AdLib \330\341\337\336\333\354\327\343\325\342\341\357 \334\335\336\323\330\334\330 \330\323\340\320\334\330" },
 	{ 19, "\275\336\322\320\357 \330\323\340\320..." },
-	{ 20, "\300\320\341\342\325\340\330\327\320\342\336\340 \341\336 \341\323\333\320\326\330\322\320\335\330\325\334 (16bpp)" },
-	{ 21, "\272\336\340\340\325\332\346\330\357 \341\336\336\342\335\336\350\325\335\330\357 \341\342\336\340\336\335" },
-	{ 22, "\275\320\327\335\320\347\325\335\335\320\357 \332\333\320\322\330\350\320 : %s" },
-	{ 23, "\275\320\327\335\320\347\325\335\335\320\357 \332\333\320\322\330\350\320 : \335\325\342" },
-	{ 24, "\260\343\324\330\336" },
-	{ 25, "\260\322\342\336\341\336\345\340\320\335\325\335\330\325:" },
-	{ 26, "\264\336\341\342\343\337\335\353\325 \324\322\330\326\332\330:" },
-	{ 27, "\276 \337~\340~\336\323\340\320\334\334\325..." },
-	{ 28, "\275\320\327\335\320\347\330\342\354 \332\333\320\322\330\350\330" },
-	{ 29, "\262\341\361" },
-	{ 30, "\317\340\332\336\341\342\354:" },
-	{ 31, "\276\342\334\325\335\320" },
-	{ 32, "\275\325 \334\336\323\343 \341\336\327\324\320\342\354 \344\320\331\333" },
-	{ 33, "\270\327\334\325\335\330\342\354 \336\337\346\330\330 \330\323\340\353" },
-	{ 34, "\270\327\334\325\335\330\342\354 \323\333\336\321\320\333\354\335\353\325 \336\337\346\330\330 ScummVM" },
-	{ 35, "\276\342\334\325\342\354\342\325, \325\341\333\330 \343 \322\320\341 \337\336\324\332\333\356\347\325\335\336 Roland-\341\336\322\334\325\341\342\330\334\336\325 \327\322\343\332\336\322\336\325 \343\341\342\340\336\331\341\342\322\336 \330 \322\353 \345\336\342\330\342\325 \325\323\336 \330\341\337\336\333\354\327\336\322\320\342\354" },
-	{ 36, "\262\353\321\340\320\342\354" },
-	{ 37, "\262\353\321\325\340\330\342\325 \324\325\331\341\342\322\330\325 \324\333\357 \335\320\327\335\320\347\325\335\330\357" },
-	{ 38, "\276\347\330\341\342\330\342\354 \327\335\320\347\325\335\330\325" },
-	{ 39, "\267\320\332\340\353\342\354" },
-	{ 40, "\272\336\340\340\325\332\342\330\340\336\322\320\342\354 \341\336\336\342\335\336\350\325\335\330\325 \341\342\336\340\336\335 \324\333\357 \330\323\340 \341 \340\320\327\340\325\350\325\335\330\325\334 320x200" },
-	{ 41, "\275\325 \334\336\323\343 \335\320\331\342\330 \324\322\330\326\336\332 \324\333\357 \327\320\337\343\341\332\320 \322\353\321\340\320\335\335\336\331 \330\323\340\353" },
-	{ 42, "\302\325\332\343\351\330\331 \322\330\324\325\336\340\325\326\330\334:" },
-	{ 43, "\272\343\340\341\336\340 \322\335\330\327" },
-	{ 44, "\272\343\340\341\336\340 \322\333\325\322\336" },
-	{ 45, "\272\343\340\341\336\340 \322\337\340\320\322\336" },
-	{ 46, "\272\343\340\341\336\340 \322\322\325\340\345" },
-	{ 47, "\315\334\343\333\357\342\336\340 DOSBox OPL" },
-	{ 48, "DVD" },
-	{ 49, "DVD \337\336\324\332\333\356\347\325\335 \343\341\337\325\350\335\336" },
-	{ 50, "DVD \335\325 \337\336\324\332\333\356\347\325\335" },
-	{ 51, "\264\320\342\320: " },
-	{ 52, "\276\342\333\320\324\347\330\332" },
-	{ 53, "\277\336 \343\334\336\333\347\320\335\330\356" },
-	{ 54, "\303\324\320\333\330\342\354" },
-	{ 55, "\267\320\337\340\325\342\330\342\354 \322\353\332\333\356\347\325\335\330\325" },
-	{ 56, "\261\325\327 \323\340\320\344\330\332\330" },
-	{ 57, "\275\320\331\324\325\335\336 %d \335\336\322\353\345 \330\323\340 ..." },
-	{ 58, "\275\320\331\324\325\335\336 %d \335\336\322\353\345 \330\323\340." },
-	{ 59, "\277\336\332\320\327\320\342\354 " },
-	{ 60, "\277\336\332\320\327\320\342\354 \332\333\320\322\330\320\342\343\340\343" },
-	{ 61, "\262\353 \324\325\331\341\342\322\330\342\325\333\354\335\336 \345\336\342\330\342\325 \343\324\320\333\330\342\354 \355\342\336 \341\336\345\340\320\335\325\335\330\325?" },
-	{ 62, "\262\353 \324\325\331\341\342\322\330\342\325\333\354\335\336 \345\336\342\330\342\325 \343\324\320\333\330\342\354 \343\341\342\320\335\336\322\332\330 \324\333\357 \355\342\336\331 \330\323\340\353?" },
-	{ 63, "\262\353 \324\325\331\341\342\322\330\342\325\333\354\335\336 \345\336\342\330\342\325 \327\320\337\343\341\342\330\342\354 \324\325\342\325\332\342\336\340 \322\341\325\345 \330\323\340? \315\342\336 \337\336\342\325\335\346\330\320\333\354\335\336 \334\336\326\325\342 \324\336\321\320\322\330\342\354 \321\336\333\354\350\336\325 \332\336\333\330\347\325\341\342\322\336 \330\323\340." },
-	{ 64, "\262\353 \345\336\342\330\342\325 \327\320\323\340\343\327\330\342\354 \333\330\321\336 \341\336\345\340\320\335\330\342\354 \330\323\340\343?" },
-	{ 65, "\262\353 \345\336\342\330\342\325 \337\340\336\330\327\322\325\341\342\330 \320\322\342\336\334\320\342\330\347\325\341\332\330\331 \337\336\330\341\332?" },
-	{ 66, "\262\353 \345\336\342\330\342\325 \322\353\331\342\330?" },
-	{ 67, "\264\322\336\331\335\336\331 \343\324\320\340" },
-	{ 68, "\262\335\330\327" },
-	{ 69, "\262\332\333\356\347\330\342\354 \340\325\326\330\334 Roland GS" },
-	{ 70, "\264\322\330\326\336\332 \335\325 \337\336\324\324\325\340\326\330\322\320\325\342 \343\340\336\322\325\335\354 \336\342\333\320\324\332\330 '%s'" },
-	{ 71, "English" },
-	{ 72, "\276\350\330\321\332\320 \327\320\337\343\341\332\320 \330\323\340\353:" },
-	{ 73, "\276\350\330\321\332\320 \322\336 \322\340\325\334\357 \337\336\324\332\333\356\347\325\335\330\357 DVD" },
-	{ 74, "\264\336\337. \337\343\342\354:" },
-	{ 75, "\315\334\343\333\357\342\336\340 FM Towns" },
-	{ 76, "\261\353\341\342\340\353\331 \340\325\326\330\334" },
-	{ 77, "\262\332\333\356\347\325\335\335\353\325 \322 \321\330\333\324 \336\337\346\330\330:" },
-	{ 78, "\301\322\336\321\336\324\335\353\331 \336\321\327\336\340" },
-	{ 79, "\277\336\333\335\336\325 \335\320\327\322\320\335\330\325 \330\323\340\353" },
-	{ 80, "\277\336\333\335\336\355\332\340\320\335\335\353\331 \340\325\326\330\334" },
-	{ 81, "\303\341\332\336\340\325\335\330\325 GC \337\320\324\320:" },
-	{ 82, "\307\343\322\341\342\322\330\342\325\333\354\335\336\341\342\354 GC \337\320\324\320:" },
-	{ 83, "\263\340\344" },
-	{ 84, "\303\341\342\340\336\331\341\342\322\336 GM:" },
-	{ 85, "\317\327\353\332 GUI:" },
-	{ 86, "\300\330\341\336\322\320\333\332\320 GUI:" },
-	{ 87, "\270\323\340\320" },
-	{ 88, "\275\325\342 \344\320\331\333\336\322 \330\323\340\353" },
-	{ 89, "Game Id \335\325 \337\336\324\324\325\340\326\330\322\320\325\342\341\357" },
-	{ 90, "\263\324\325 \330\323\340\320: " },
-	{ 91, "\263\333\336\321\320\333\354\335\336\325 \334\325\335\356" },
-	{ 92, "\277\325\340\325\331\342\330 \335\320 \324\330\340\325\332\342\336\340\330\356 \343\340\336\322\335\325\334 \322\353\350\325" },
-	{ 93, "\262\322\325\340\345" },
-	{ 94, "\263\340\320\344\330\332\320" },
-	{ 95, "\263\340\320\344. \340\325\326\330\334:" },
-	{ 96, "\305\320\340\324\322\320\340\335\336\325 \334\320\341\350\342\320\321\330\340\336\322\320\335\330\325 (\321\353\341\342\340\336, \335\336 \335\330\327\332\336\323\336 \332\320\347\325\341\342\322\320)" },
-	{ 97, "Hercules \317\335\342\320\340\335\353\331" },
-	{ 98, "Hercules \267\325\333\325\335\353\331" },
-	{ 99, "\301\337\340\357\342\320\342\354 \337\320\335\325\333\354 \330\335\341\342\340\343\334\325\335\342\336\322" },
-	{ 100, "\262\353\341\336\332\336\325 \332\320\347\325\341\342\322\336 \327\322\343\332\320 (\334\325\324\333\325\335\335\325\325) (\340\325\321\343\342)" },
-	{ 101, "\261\276\333\354\350\330\325 \327\335\320\347\325\335\330\357 \327\320\324\320\356\342 \333\343\347\350\325\325 \332\320\347\325\341\342\322\336 \327\322\343\332\320, \336\324\335\320\332\336 \336\335\330 \334\336\323\343\342 \335\325 \337\336\324\324\325\340\326\330\322\320\342\354\341\357 \322\320\350\325\331 \327\322\343\332\336\322\336\331 \332\320\340\342\336\331" },
-	{ 102, "\303\324\325\340\326\330\322\320\331\342\325 \332\333\320\322\330\350\343 Shift \324\333\357 \342\336\323\336, \347\342\336\321\353 \324\336\321\320\322\330\342\354 \335\325\341\332\336\333\354\332\336 \330\323\340" },
-	{ 103, "\263\336\340\330\327\336\335\342\320\333\354\335\353\331 underscan:" },
-	{ 104, "\315\334\343\333\357\342\336\340 IBM PCjr" },
-	{ 105, "ID:" },
-	{ 106, "\270\335\330\346\330\320\333\330\327\320\346\330\357 \341\325\342\330" },
-	{ 107, "\275\320\347\320\333\354\335\353\331 \334\320\341\350\342\320\321 \322\325\340\345\335\325\323\336 \355\332\340\320\335\320:" },
-	{ 108, "\275\320\341\342\340\320\330\322\320\356 \355\334\343\333\357\342\336\340 MT-32" },
-	{ 109, "\275\320\341\342\340\320\330\322\320\356 \341\325\342\354" },
-	{ 110, "\262\322\336\324" },
-	{ 111, "\275\325\322\325\340\335\353\331 \337\343\342\354" },
-	{ 112, "\275\320\327\335\320\347\325\335\330\325 \332\333\320\322\330\350" },
-	{ 113, "\272\333\320\322\330\320\342\343\340\320" },
-	{ 114, "\302\320\321\333\330\346\320 \332\333\320\322\330\350:" },
-	{ 115, "\272\333\320\322\330\350\330" },
-	{ 116, "\317\327\353\332 \323\340\320\344\330\347\325\341\332\336\323\336 \330\335\342\325\340\344\325\331\341\320 ScummVM" },
-	{ 117, "\317\327\353\332 \330\323\340\353. \270\327\334\325\335\325\335\330\325 \355\342\336\323\336 \337\320\340\320\334\325\342\340\320 \335\325 \337\340\325\322\340\320\342\330\342 \330\323\340\343 \335\320 \320\335\323\333\330\331\341\332\336\334 \322 \340\343\341\341\332\343\356" },
-	{ 118, "\317\327\353\332:" },
-	{ 119, "\262\333\325\322\336" },
-	{ 120, "\273\325\322\353\331 \351\325\333\347\336\332" },
-	{ 121, "\267\320\323\340\343\327\330\342\354" },
-	{ 122, "\267\320\323\340\343\327\330\342\354 \330\323\340\343:" },
-	{ 123, "\267\320\323\340\343\327\330\342\354 \341\336\345\340\335\325\335\330\325 \324\333\357 \322\353\321\340\320\335\335\336\331 \330\323\340\353" },
-	{ 124, "\315\334\343\333\357\342\336\340 MAME OPL" },
-	{ 125, "MIDI" },
-	{ 126, "\303\341\330\333\325\335\330\325 MIDI:" },
-	{ 127, "MT-32" },
-	{ 128, "\303\341\342\340. MT-32:" },
-	{ 129, "\315\334\343\333\357\342\336\340 MT-32" },
-	{ 130, "\274\320\341\350\342\320\321 \323\333\320\322\335\336\323\336 \355\332\340\320\335\320:" },
-	{ 131, "\275\320\327\335\320\347\330\342\354" },
-	{ 132, "\274\335\336\323\336 \330\323\340..." },
-	{ 133, "\274\325\335\356" },
-	{ 134, "\300\320\327\335\336\325" },
-	{ 135, "\301\334\325\350\320\335\335\353\331 \340\325\326\330\334 AdLib/MIDI" },
-	{ 136, "\277\336\324\332\333\356\347\330\342\354 DVD" },
-	{ 137, "\277\336\324\332\333\356\347\330\342\354 SMB" },
-	{ 138, "\272\333\330\332 \334\353\350\354\356" },
-	{ 139, "\274\343\333\354\342\330\344\343\335\332\346\330\357" },
-	{ 140, "\267\322\343\332\336\322\336\325 \343\341\342-\322\336:" },
-	{ 141, "\263\340\336\334\332. \334\343\327\353\332\330:" },
-	{ 142, "\262\353\332\333. \322\341\361" },
-	{ 143, "\275\320\327\322:" },
-	{ 144, "\301\325\342\354 \322\353\332\333\356\347\325\335\320" },
-	{ 145, "\301\325\342\354 \335\325 \335\320\341\342\340\336\325\335\320 (%d)" },
-	{ 146, "\301\325\342\354 \340\320\321\336\342\320\325\342" },
-	{ 147, "\301\325\342\354 \340\320\321\336\342\320\325\342, \337\320\337\332\320 \337\336\324\332\333\356\347\325\335\320" },
-	{ 148, "\275\330\332\336\323\324\320" },
-	{ 149, "\275\325\342" },
-	{ 150, "\264\320\342\320 \335\325 \327\320\337\330\341\320\335\320" },
-	{ 151, "\261\325\327 \334\343\327\353\332\330" },
-	{ 152, "\262\340\325\334\357 \330\323\340\353 \335\325 \327\320\337\330\341\320\335\336" },

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list