GUI: Update translations after the last message changes

svn-id: r50328

7 files changed, 585 insertions, 418 deletions

diff --git a/po/POTFILES b/po/POTFILES
index 6f23ac6c51..28ca60d31b 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -16,24 +16,30 @@ gui/ThemeEngine.cpp
 base/main.cpp
 
 common/error.cpp
+common/util.cpp
 
 engines/dialogs.cpp
 engines/scumm/dialogs.cpp
 engines/mohawk/dialogs.cpp
 
+sound/fmopl.cpp
 sound/musicplugin.cpp
 sound/null.h
 sound/null.cpp
-sound/softsynth/mt32.cpp
 sound/softsynth/adlib.cpp
+sound/softsynth/mt32.cpp
+sound/softsynth/pcspk.cpp
 sound/softsynth/ym2612.cpp
 
 backends/keymapper/remap-dialog.cpp
+backends/midi/windows.cpp
 backends/platform/ds/arm9/source/dsoptions.cpp
 backends/platform/iphone/osys_events.cpp
+backends/platform/sdl/graphics.cpp
 backends/platform/symbian/src/SymbianActions.cpp
 backends/platform/symbian/src/SymbianOS.cpp
 backends/platform/wii/options.cpp
 backends/platform/wince/CEActionsPocket.cpp
 backends/platform/wince/CEActionsSmartphone.cpp
 backends/platform/wince/CELauncherDialog.cpp
+backends/platform/wince/wince-sdl.cpp
diff --git a/po/ca_ES.po b/po/ca_ES.po
index ba2e4be096..edaf59cb46 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.2.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2010-06-26 18:03+0200\n"
+"POT-Creation-Date: 2010-06-26 18:15+0200\n"
 "PO-Revision-Date: 2010-06-26 16:45+0100\n"
 "Last-Translator: Jordi Vilalta Prat <jvprat@gmail.com>\n"
 "Language-Team: Catalan <scummvm-devel@lists.sf.net>\n"
-"Language: Catalan\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: Catalan\n"
 
 #: gui/about.cpp:96
 #, c-format
@@ -960,11 +960,11 @@ msgstr "~T~ransicions activades"
 msgid "~W~ater Effect Enabled"
 msgstr "~E~fecte de l'aigua activat"
 
-#: sound/fmopl.cpp:50
+#: sound/fmopl.cpp:51
 msgid "MAME OPL emulator"
 msgstr "Emulador OPL de MAME"
 
-#: sound/fmopl.cpp:52
+#: sound/fmopl.cpp:53
 msgid "DOSBox OPL emulator"
 msgstr "Emulador OPL de DOSBox"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 283e3fa134..ef0a7b9baa 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -3,12 +3,11 @@
 # This file is distributed under the same license as the ScummVM package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
 #
-#: sound/null.cpp:35
 msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.2.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2010-06-24 23:30+0100\n"
+"POT-Creation-Date: 2010-06-26 18:15+0200\n"
 "PO-Revision-Date: 2010-06-23 19:30+0100\n"
 "Last-Translator: \n"
 "Language-Team: Lothar Serra Mari <Lothar@Windowsbase.de> & Simon Sawatzki "
@@ -20,15 +19,18 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: gui/about.cpp:96
-msgid "C2(built on "
+#, fuzzy, c-format
+msgid "(built on %s)"
 msgstr "C2(erstellt am"
 
-#: gui/about.cpp:104
-msgid "C1Features compiled in:"
+#: gui/about.cpp:103
+#, fuzzy
+msgid "Features compiled in:"
 msgstr "C1Verwendete Funktionen:"
 
-#: gui/about.cpp:111
-msgid "C1Available engines:"
+#: gui/about.cpp:112
+#, fuzzy
+msgid "Available engines:"
 msgstr "C1Verfügbare Spiele-Engines:"
 
 #: gui/browser.cpp:69
@@ -40,7 +42,7 @@ msgid "Go to previous directory level"
 msgstr "Zu höherer Pfadebene wechseln"
 
 #: gui/browser.cpp:70 gui/chooser.cpp:49 gui/KeysDialog.cpp:46
-#: gui/launcher.cpp:266 gui/massadd.cpp:95 gui/options.cpp:978
+#: gui/launcher.cpp:266 gui/massadd.cpp:95 gui/options.cpp:989
 #: gui/saveload.cpp:65 gui/saveload.cpp:157 gui/themebrowser.cpp:56
 #: backends/platform/wii/options.cpp:48
 msgid "Cancel"
@@ -75,7 +77,8 @@ msgid "Map"
 msgstr "Zuweisen"
 
 #: gui/KeysDialog.cpp:45 gui/launcher.cpp:267 gui/launcher.cpp:873
-#: gui/launcher.cpp:877 gui/massadd.cpp:92 gui/options.cpp:979
+#: gui/launcher.cpp:877 gui/massadd.cpp:92 gui/options.cpp:990
+#: backends/platform/wii/options.cpp:47
 #: backends/platform/wince/CELauncherDialog.cpp:56
 msgid "OK"
 msgstr "OK"
@@ -143,7 +146,7 @@ msgstr ""
 "Spiels in eine deutsche verwandeln."
 
 #: gui/launcher.cpp:183 gui/launcher.cpp:194 gui/options.cpp:80
-#: gui/options.cpp:623 gui/options.cpp:633 gui/options.cpp:959
+#: gui/options.cpp:623 gui/options.cpp:633 gui/options.cpp:960
 #: sound/null.cpp:42
 msgid "<default>"
 msgstr "<Standard>"
@@ -156,11 +159,11 @@ msgstr "Plattform:"
 msgid "Platform the game was originally designed for"
 msgstr "Plattform, für die das Spiel ursprünglich erstellt wurde"
 
-#: gui/launcher.cpp:204 gui/options.cpp:866 gui/options.cpp:883
+#: gui/launcher.cpp:204 gui/options.cpp:867 gui/options.cpp:884
 msgid "Graphics"
 msgstr "Grafik"
 
-#: gui/launcher.cpp:204 gui/options.cpp:866 gui/options.cpp:883
+#: gui/launcher.cpp:204 gui/options.cpp:867 gui/options.cpp:884
 msgid "GFX"
 msgstr "GFX"
 
@@ -168,7 +171,7 @@ msgstr "GFX"
 msgid "Override global graphic settings"
 msgstr "Globale Grafikeinstellungen übergehen"
 
-#: gui/launcher.cpp:213 gui/options.cpp:889
+#: gui/launcher.cpp:213 gui/options.cpp:890
 msgid "Audio"
 msgstr "Audio"
 
@@ -176,7 +179,7 @@ msgstr "Audio"
 msgid "Override global audio settings"
 msgstr "Globale Audioeinstellungen übergehen"
 
-#: gui/launcher.cpp:223 gui/options.cpp:893
+#: gui/launcher.cpp:223 gui/options.cpp:894
 msgid "Volume"
 msgstr "Lautstärke"
 
@@ -184,7 +187,7 @@ msgstr "Lautstärke"
 msgid "Override global volume settings"
 msgstr "Globale Lautstärke-Einstellungen übergehen"
 
-#: gui/launcher.cpp:232 gui/options.cpp:901
+#: gui/launcher.cpp:232 gui/options.cpp:902
 msgid "MIDI"
 msgstr "MIDI"
 
@@ -192,7 +195,7 @@ msgstr "MIDI"
 msgid "Override global MIDI settings"
 msgstr "Globale MIDI-Einstellungen übergehen"
 
-#: gui/launcher.cpp:244 gui/options.cpp:907
+#: gui/launcher.cpp:244 gui/options.cpp:908
 msgid "Paths"
 msgstr "Pfade"
 
@@ -200,7 +203,7 @@ msgstr "Pfade"
 msgid "Game Path:"
 msgstr "Spielpfad:"
 
-#: gui/launcher.cpp:254 gui/options.cpp:920
+#: gui/launcher.cpp:254 gui/options.cpp:921
 msgid "Extra Path:"
 msgstr "Extrapfad:"
 
@@ -212,18 +215,18 @@ msgstr "Legt das Verzeichnis für zusätzliche Spieldateien fest."
 msgid "Save Path:"
 msgstr "Spielstände:"
 
-#: gui/launcher.cpp:258 gui/launcher.cpp:259 gui/options.cpp:914
-#: gui/options.cpp:915
+#: gui/launcher.cpp:258 gui/launcher.cpp:259 gui/options.cpp:915
+#: gui/options.cpp:916
 msgid "Specifies where your savegames are put"
 msgstr "Legt fest, wo die Spielstände abgelegt werden."
 
 #: gui/launcher.cpp:275 gui/launcher.cpp:353 gui/launcher.cpp:398
 #: gui/options.cpp:259 gui/options.cpp:406 gui/options.cpp:492
-#: gui/options.cpp:551 gui/options.cpp:711 gui/options.cpp:918
-#: gui/options.cpp:921 gui/options.cpp:925 gui/options.cpp:1002
-#: gui/options.cpp:1008 gui/options.cpp:1014 gui/options.cpp:1022
-#: gui/options.cpp:1046 gui/options.cpp:1050 gui/options.cpp:1056
-#: gui/options.cpp:1063 gui/options.cpp:1162
+#: gui/options.cpp:551 gui/options.cpp:712 gui/options.cpp:919
+#: gui/options.cpp:922 gui/options.cpp:926 gui/options.cpp:1013
+#: gui/options.cpp:1019 gui/options.cpp:1025 gui/options.cpp:1033
+#: gui/options.cpp:1057 gui/options.cpp:1061 gui/options.cpp:1067
+#: gui/options.cpp:1074 gui/options.cpp:1173
 msgid "None"
 msgstr "Keine"
 
@@ -232,7 +235,7 @@ msgstr "Keine"
 msgid "Default"
 msgstr "<Standard>"
 
-#: gui/launcher.cpp:391 gui/options.cpp:1156
+#: gui/launcher.cpp:391 gui/options.cpp:1167
 msgid "Select SoundFont"
 msgstr "SoundFont auswählen"
 
@@ -326,7 +329,7 @@ msgstr "In Spieleliste suchen"
 msgid "Search:"
 msgstr "Suchen:"
 
-#: gui/launcher.cpp:529 gui/options.cpp:712
+#: gui/launcher.cpp:529 gui/options.cpp:713
 msgid "Clear value"
 msgstr "Wert löschen"
 
@@ -512,22 +515,22 @@ msgstr ""
 
 #: gui/options.cpp:656
 #, fuzzy
-msgid "Specifies default sound device for General Midi output"
+msgid "Specifies default sound device for General MIDI output"
 msgstr "Legt das Musikwiedergabe-Gerät oder den Soundkarten-Emulator fest."
 
-#: gui/options.cpp:687
+#: gui/options.cpp:688
 msgid "AdLib emulator:"
 msgstr "AdLib-Emulator"
 
-#: gui/options.cpp:687 gui/options.cpp:688
+#: gui/options.cpp:688 gui/options.cpp:689
 msgid "AdLib is used for music in many games"
 msgstr "AdLib wird für die Musik in vielen Spielen verwendet."
 
-#: gui/options.cpp:698
+#: gui/options.cpp:699
 msgid "Output rate:"
 msgstr "Ausgabefrequenz:"
 
-#: gui/options.cpp:698 gui/options.cpp:699
+#: gui/options.cpp:699 gui/options.cpp:700
 msgid ""
 "Higher value specifies better sound quality but may be not supported by your "
 "soundcard"
@@ -535,28 +538,28 @@ msgstr ""
 "Höhere Werte bewirken eine bessere Soundqualität, werden aber möglicherweise "
 "nicht von jeder Soundkarte unterstützt."
 
-#: gui/options.cpp:710
+#: gui/options.cpp:711
 msgid "SoundFont:"
 msgstr "SoundFont:"
 
-#: gui/options.cpp:710 gui/options.cpp:711
+#: gui/options.cpp:711 gui/options.cpp:712
 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
 msgstr ""
 "SoundFont wird von einigen Soundkarten, Fluidsynth und Timidity unterstützt."
 
-#: gui/options.cpp:715
+#: gui/options.cpp:716
 msgid "Mixed AdLib/MIDI mode"
 msgstr "AdLib-/MIDI-Modus"
 
-#: gui/options.cpp:715
+#: gui/options.cpp:716
 msgid "Use both MIDI and AdLib sound generation"
 msgstr "Benutzt MIDI und AdLib zur Sounderzeugung."
 
-#: gui/options.cpp:718
+#: gui/options.cpp:719
 msgid "True Roland MT-32 (disable GM emulation)"
 msgstr "Echte Roland-MT-32-Emulation"
 
-#: gui/options.cpp:718
+#: gui/options.cpp:719
 msgid ""
 "Check if you want to use your real hardware Roland-compatible sound device "
 "connected to your computer"
@@ -564,145 +567,145 @@ msgstr ""
 "Wählen Sie dies aus, wenn Sie Ihre echte Hardware, die mit einer Roland-"
 "kompatiblen Soundkarte verbunden ist, verwenden möchten."
 
-#: gui/options.cpp:721
+#: gui/options.cpp:722
 msgid "Enable Roland GS Mode"
 msgstr "Roland-GS-Modus"
 
-#: gui/options.cpp:721
+#: gui/options.cpp:722
 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
 msgstr ""
 "Schaltet die General-MIDI-Zuweisung für Spiele mit Roland-MT-32-Audiospur "
 "aus."
 
-#: gui/options.cpp:724
+#: gui/options.cpp:725
 msgid "MIDI gain:"
 msgstr "MIDI-Lautstärke:"
 
-#: gui/options.cpp:737
+#: gui/options.cpp:738
 msgid "Text and Speech:"
 msgstr "Text und Sprache:"
 
-#: gui/options.cpp:742 gui/options.cpp:748
+#: gui/options.cpp:743 gui/options.cpp:749
 msgid "Speech"
 msgstr "Sprache"
 
-#: gui/options.cpp:743 gui/options.cpp:749
+#: gui/options.cpp:744 gui/options.cpp:750
 msgid "Subtitles"
 msgstr "Untertitel"
 
-#: gui/options.cpp:744 gui/options.cpp:750
+#: gui/options.cpp:745 gui/options.cpp:751
 msgid "Both"
 msgstr "Beides"
 
-#: gui/options.cpp:748
+#: gui/options.cpp:749
 msgid "Spch"
 msgstr "Spr."
 
-#: gui/options.cpp:749
+#: gui/options.cpp:750
 msgid "Subs"
 msgstr "Untert."
 
-#: gui/options.cpp:750
+#: gui/options.cpp:751
 msgid "Show subtitles and play speech"
 msgstr "Untertitel anzeigen und Sprachausgabe aktivieren"
 
-#: gui/options.cpp:754
+#: gui/options.cpp:755
 msgid "Subtitle speed:"
 msgstr "Untertitel-Tempo:"
 
-#: gui/options.cpp:766
+#: gui/options.cpp:767
 msgid "Music volume:"
 msgstr "Musiklautstärke:"
 
-#: gui/options.cpp:773
+#: gui/options.cpp:774
 msgid "Mute All"
 msgstr "Alles aus"
 
-#: gui/options.cpp:776
+#: gui/options.cpp:777
 msgid "SFX volume:"
 msgstr "Effektlautstärke:"
 
-#: gui/options.cpp:776 gui/options.cpp:777
+#: gui/options.cpp:777 gui/options.cpp:778
 msgid "Special sound effects volume"
 msgstr "Lautstärke spezieller Soundeffekte"
 
-#: gui/options.cpp:783
+#: gui/options.cpp:784
 msgid "Speech volume:"
 msgstr "Sprachlautstärke:"
 
-#: gui/options.cpp:914
+#: gui/options.cpp:915
 msgid "Save Path: "
 msgstr "Speicherpfad: "
 
-#: gui/options.cpp:917
+#: gui/options.cpp:918
 msgid "Theme Path:"
 msgstr "Themenpfad:"
 
-#: gui/options.cpp:920 gui/options.cpp:921
+#: gui/options.cpp:921 gui/options.cpp:922
 msgid "Specifies path to additional data used by all games or ScummVM"
 msgstr ""
 "Legt das Verzeichnis für zusätzliche Spieldateien für alle Spiele in ScummVM "
 "fest."
 
-#: gui/options.cpp:924
+#: gui/options.cpp:925
 msgid "Plugins Path:"
 msgstr "Plugin-Pfad:"
 
-#: gui/options.cpp:929
+#: gui/options.cpp:930
 msgid "Misc"
 msgstr "Verschiedenes"
 
-#: gui/options.cpp:931
+#: gui/options.cpp:932
 msgid "Theme:"
 msgstr "Thema:"
 
-#: gui/options.cpp:935
+#: gui/options.cpp:936
 msgid "GUI Renderer:"
 msgstr "GUI-Renderer:"
 
-#: gui/options.cpp:941
+#: gui/options.cpp:942
 msgid "Autosave:"
 msgstr "Autom. Speichern:"
 
-#: gui/options.cpp:949
+#: gui/options.cpp:950
 msgid "Keys"
 msgstr "Tasten"
 
-#: gui/options.cpp:956
+#: gui/options.cpp:957
 msgid "GUI Language:"
 msgstr "GUI-Sprache:"
 
-#: gui/options.cpp:956
+#: gui/options.cpp:957
 msgid "Language of ScummVM GUI"
 msgstr "Sprache der ScummVM-Oberfläche"
 
-#: gui/options.cpp:961
+#: gui/options.cpp:962
 msgid "English"
 msgstr "English"
 
-#: gui/options.cpp:1095
+#: gui/options.cpp:1106
 msgid "You have to restart ScummVM to take the effect."
 msgstr "Sie müssen ScummVM neustarten, um die Einstellungen zu übernehmen."
 
-#: gui/options.cpp:1108
+#: gui/options.cpp:1119
 msgid "Select directory for savegames"
 msgstr "Verzeichnis für Spielstände auswählen"
 
-#: gui/options.cpp:1115
+#: gui/options.cpp:1126
 msgid "The chosen directory cannot be written to. Please select another one."
 msgstr ""
 "In das gewählte Verzeichnis kann nicht geschrieben werden. Bitte ein anderes "
 "auswählen."
 
-#: gui/options.cpp:1124
+#: gui/options.cpp:1135
 msgid "Select directory for GUI themes"
 msgstr "Verzeichnis für Oberflächen-Themen"
 
-#: gui/options.cpp:1134
+#: gui/options.cpp:1145
 msgid "Select directory for extra files"
 msgstr "Verzeichnis für zusätzliche Dateien auswählen"
 
-#: gui/options.cpp:1145
+#: gui/options.cpp:1156
 msgid "Select directory for plugins"
 msgstr "Verzeichnis für Erweiterungen auswählen"
 
@@ -873,6 +876,14 @@ msgstr "Daten konnten nicht geschrieben werden."
 msgid "Unknown Error"
 msgstr "Unbekannter Fehler"
 
+#: common/util.cpp:254
+msgid "Hercules Green"
+msgstr ""
+
+#: common/util.cpp:255
+msgid "Hercules Amber"
+msgstr ""
+
 #: engines/dialogs.cpp:89
 msgid "~R~esume"
 msgstr "~F~ortsetzen"
@@ -952,10 +963,24 @@ msgstr "Über~g~änge aktiviert"
 msgid "~W~ater Effect Enabled"
 msgstr "~W~assereffekte aktiviert"
 
+#: sound/fmopl.cpp:51
+#, fuzzy
+msgid "MAME OPL emulator"
+msgstr "AdLib-Emulator"
+
+#: sound/fmopl.cpp:53
+msgid "DOSBox OPL emulator"
+msgstr ""
+
 #: sound/null.h:45
 msgid "No music"
 msgstr "Keine Musik"
 
+#: sound/softsynth/adlib.cpp:1590
+#, fuzzy
+msgid "AdLib Emulator"
+msgstr "AdLib-Emulator"
+
 #: sound/softsynth/mt32.cpp:327
 #, fuzzy
 msgid "Initialising MT-32 Emulator"
@@ -966,10 +991,15 @@ msgstr "Netzwerk wird gestartet..."
 msgid "MT-32 Emulator"
 msgstr "MT-32-Emulation"
 
-#: sound/softsynth/adlib.cpp:1590
+#: sound/softsynth/pcspk.cpp:142
 #, fuzzy
-msgid "AdLib Emulator"
-msgstr "AdLib-Emulator"
+msgid "PC Speaker Emulator"
+msgstr "PC-Lautsprecher"
+
+#: sound/softsynth/pcspk.cpp:161
+#, fuzzy
+msgid "IBM PCjr Emulator"
+msgstr "FM Towns"
 
 #: sound/softsynth/ym2612.cpp:762
 #, fuzzy
@@ -992,6 +1022,10 @@ msgstr " (Global)"
 msgid " (Game)"
 msgstr " (Spiel)"
 
+#: backends/midi/windows.cpp:156
+msgid "Windows MIDI"
+msgstr "Windows MIDI"
+
 #: backends/platform/ds/arm9/source/dsoptions.cpp:57
 msgid "ScummVM Main Menu"
 msgstr "ScummVM-Hauptmenü"
@@ -1072,6 +1106,12 @@ msgstr "Touchpad-Modus aktiviert."
 msgid "Touchpad mode disabled."
 msgstr "Touchpad-Modus ausgeschaltet."
 
+#: backends/platform/sdl/graphics.cpp:40
+#: backends/platform/wince/wince-sdl.cpp:111
+#: backends/platform/wince/wince-sdl.cpp:118
+msgid "Normal (no scaling)"
+msgstr ""
+
 #: backends/platform/symbian/src/SymbianActions.cpp:41
 #: backends/platform/wince/CEActionsSmartphone.cpp:38
 msgid "Up"
@@ -1152,10 +1192,6 @@ msgstr "Tasten zuordnen"
 msgid "Do you want to quit ?"
 msgstr "Möchten Sie beenden?"
 
-#: backends/platform/wii/options.cpp:47
-msgid "Ok"
-msgstr "OK"
-
 #: backends/platform/wii/options.cpp:51
 msgid "Video"
 msgstr "Video"
@@ -1368,12 +1404,12 @@ msgstr "Anzeige"
 msgid "Do you want to perform an automatic scan ?"
 msgstr "Möchten Sie eine automatische Durchsuchung vornehmen?"
 
+#~ msgid "Ok"
+#~ msgstr "OK"
+
 #~ msgid "Music driver:"
 #~ msgstr "Musiktreiber"
 
-#~ msgid "Windows MIDI"
-#~ msgstr "Windows MIDI"
-
 #~ msgid "ALSA"
 #~ msgstr "ALSA"
 
@@ -1407,9 +1443,6 @@ msgstr "Möchten Sie eine automatische Durchsuchung vornehmen?"
 #~ msgid "AdLib"
 #~ msgstr "AdLib"
 
-#~ msgid "PC Speaker"
-#~ msgstr "PC-Lautsprecher"
-
 #~ msgid "IBM PCjr"
 #~ msgstr "IBM PCjr"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 4ae04d05f0..70a22bb0f3 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -3,12 +3,11 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: sound/null.cpp:35
 msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.2.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2010-06-24 23:30+0100\n"
+"POT-Creation-Date: 2010-06-26 18:15+0200\n"
 "PO-Revision-Date: 2010-06-19 23:43+0100\n"
 "Last-Translator: Thierry Crozat <criezy@scummvm.org>\n"
 "Language-Team: French <scummvm-devel@lists.sf.net>\n"
@@ -19,15 +18,18 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #: gui/about.cpp:96
-msgid "C2(built on "
+#, fuzzy, c-format
+msgid "(built on %s)"
 msgstr "C2(compilé sur"
 
-#: gui/about.cpp:104
-msgid "C1Features compiled in:"
+#: gui/about.cpp:103
+#, fuzzy
+msgid "Features compiled in:"
 msgstr "C1Options incluses:"
 
-#: gui/about.cpp:111
-msgid "C1Available engines:"
+#: gui/about.cpp:112
+#, fuzzy
+msgid "Available engines:"
 msgstr "C1Moteurs disponibles:"
 
 #: gui/browser.cpp:69
@@ -39,7 +41,7 @@ msgid "Go to previous directory level"
 msgstr "Remonte d'un niveau dans la hiérarchie de répertoire"
 
 #: gui/browser.cpp:70 gui/chooser.cpp:49 gui/KeysDialog.cpp:46
-#: gui/launcher.cpp:266 gui/massadd.cpp:95 gui/options.cpp:978
+#: gui/launcher.cpp:266 gui/massadd.cpp:95 gui/options.cpp:989
 #: gui/saveload.cpp:65 gui/saveload.cpp:157 gui/themebrowser.cpp:56
 #: backends/platform/wii/options.cpp:48
 msgid "Cancel"
@@ -74,7 +76,8 @@ msgid "Map"
 msgstr "Affecter"
 
 #: gui/KeysDialog.cpp:45 gui/launcher.cpp:267 gui/launcher.cpp:873
-#: gui/launcher.cpp:877 gui/massadd.cpp:92 gui/options.cpp:979
+#: gui/launcher.cpp:877 gui/massadd.cpp:92 gui/options.cpp:990
+#: backends/platform/wii/options.cpp:47
 #: backends/platform/wince/CELauncherDialog.cpp:56
 msgid "OK"
 msgstr "OK"
@@ -142,7 +145,7 @@ msgstr ""
 "espagnole du jeu."
 
 #: gui/launcher.cpp:183 gui/launcher.cpp:194 gui/options.cpp:80
-#: gui/options.cpp:623 gui/options.cpp:633 gui/options.cpp:959
+#: gui/options.cpp:623 gui/options.cpp:633 gui/options.cpp:960
 #: sound/null.cpp:42
 msgid "<default>"
 msgstr "<defaut>"
@@ -155,11 +158,11 @@ msgstr "Plateforme:"
 msgid "Platform the game was originally designed for"
 msgstr "Plateforme pour laquelle votre jeu a été conçu"
 
-#: gui/launcher.cpp:204 gui/options.cpp:866 gui/options.cpp:883
+#: gui/launcher.cpp:204 gui/options.cpp:867 gui/options.cpp:884
 msgid "Graphics"
 msgstr "Graphique"
 
-#: gui/launcher.cpp:204 gui/options.cpp:866 gui/options.cpp:883
+#: gui/launcher.cpp:204 gui/options.cpp:867 gui/options.cpp:884
 msgid "GFX"
 msgstr "GFX"
 
@@ -167,7 +170,7 @@ msgstr "GFX"
 msgid "Override global graphic settings"
 msgstr "Utiliser des réglages graphiques spécifique à ce jeux"
 
-#: gui/launcher.cpp:213 gui/options.cpp:889
+#: gui/launcher.cpp:213 gui/options.cpp:890
 msgid "Audio"
 msgstr "Audio"
 
@@ -175,7 +178,7 @@ msgstr "Audio"
 msgid "Override global audio settings"
 msgstr "Utiliser des réglages audio spécifique à ce jeux"
 
-#: gui/launcher.cpp:223 gui/options.cpp:893
+#: gui/launcher.cpp:223 gui/options.cpp:894
 msgid "Volume"
 msgstr "Volume"
 
@@ -183,7 +186,7 @@ msgstr "Volume"
 msgid "Override global volume settings"
 msgstr "Utiliser des réglages de volume sonore spécifique à ce jeux"
 
-#: gui/launcher.cpp:232 gui/options.cpp:901
+#: gui/launcher.cpp:232 gui/options.cpp:902
 msgid "MIDI"
 msgstr "MIDI"
 
@@ -191,7 +194,7 @@ msgstr "MIDI"
 msgid "Override global MIDI settings"
 msgstr "Utiliser des réglages MIDI spécifique à ce jeux"
 
-#: gui/launcher.cpp:244 gui/options.cpp:907
+#: gui/launcher.cpp:244 gui/options.cpp:908
 msgid "Paths"
 msgstr "Chemins"
 
@@ -199,7 +202,7 @@ msgstr "Chemins"
 msgid "Game Path:"
 msgstr "Chemin du Jeu:"
 
-#: gui/launcher.cpp:254 gui/options.cpp:920
+#: gui/launcher.cpp:254 gui/options.cpp:921
 msgid "Extra Path:"
 msgstr "Extra:"
 
@@ -211,18 +214,18 @@ msgstr "Définie un chemin vers des données suplémentaires utilisées par le jeu"
 msgid "Save Path:"
 msgstr "Sauvegardes:"
 
-#: gui/launcher.cpp:258 gui/launcher.cpp:259 gui/options.cpp:914
-#: gui/options.cpp:915
+#: gui/launcher.cpp:258 gui/launcher.cpp:259 gui/options.cpp:915
+#: gui/options.cpp:916
 msgid "Specifies where your savegames are put"
 msgstr "Définie l'emplacement où les fichiers de sauvegarde sont créés"
 
 #: gui/launcher.cpp:275 gui/launcher.cpp:353 gui/launcher.cpp:398
 #: gui/options.cpp:259 gui/options.cpp:406 gui/options.cpp:492
-#: gui/options.cpp:551 gui/options.cpp:711 gui/options.cpp:918
-#: gui/options.cpp:921 gui/options.cpp:925 gui/options.cpp:1002
-#: gui/options.cpp:1008 gui/options.cpp:1014 gui/options.cpp:1022
-#: gui/options.cpp:1046 gui/options.cpp:1050 gui/options.cpp:1056
-#: gui/options.cpp:1063 gui/options.cpp:1162
+#: gui/options.cpp:551 gui/options.cpp:712 gui/options.cpp:919
+#: gui/options.cpp:922 gui/options.cpp:926 gui/options.cpp:1013
+#: gui/options.cpp:1019 gui/options.cpp:1025 gui/options.cpp:1033
+#: gui/options.cpp:1057 gui/options.cpp:1061 gui/options.cpp:1067
+#: gui/options.cpp:1074 gui/options.cpp:1173
 msgid "None"
 msgstr "Aucun"
 
@@ -231,7 +234,7 @@ msgstr "Aucun"
 msgid "Default"
 msgstr "Défaut"
 
-#: gui/launcher.cpp:391 gui/options.cpp:1156
+#: gui/launcher.cpp:391 gui/options.cpp:1167
 msgid "Select SoundFont"
 msgstr "Choisir une banque de sons"
 
@@ -324,7 +327,7 @@ msgstr "Recherche dans la liste de jeux"
 msgid "Search:"
 msgstr "Filtre:"
 
-#: gui/launcher.cpp:529 gui/options.cpp:712
+#: gui/launcher.cpp:529 gui/options.cpp:713
 msgid "Clear value"
 msgstr "Effacer la valeur"
 
@@ -509,22 +512,22 @@ msgstr ""
 
 #: gui/options.cpp:656
 #, fuzzy
-msgid "Specifies default sound device for General Midi output"
+msgid "Specifies default sound device for General MIDI output"
 msgstr "Spécifie le périphérique de sortie audio ou l'émulateur de carte audio"
 
-#: gui/options.cpp:687
+#: gui/options.cpp:688
 msgid "AdLib emulator:"
 msgstr "Émulateur AdLib:"
 
-#: gui/options.cpp:687 gui/options.cpp:688
+#: gui/options.cpp:688 gui/options.cpp:689
 msgid "AdLib is used for music in many games"
 msgstr "AdLib est utilisé pour la musique dans de nombreux jeux"
 
-#: gui/options.cpp:698
+#: gui/options.cpp:699
 msgid "Output rate:"
 msgstr "Fréquence:"
 
-#: gui/options.cpp:698 gui/options.cpp:699
+#: gui/options.cpp:699 gui/options.cpp:700
 msgid ""
 "Higher value specifies better sound quality but may be not supported by your "
 "soundcard"
@@ -532,29 +535,29 @@ msgstr ""
 "Une valeur plus élevée donne une meilleure qualité audio mais peut ne pas "
 "être supporté par votre carte son"
 
-#: gui/options.cpp:710
+#: gui/options.cpp:711
 msgid "SoundFont:"
 msgstr "Banque de sons:"
 
-#: gui/options.cpp:710 gui/options.cpp:711
+#: gui/options.cpp:711 gui/options.cpp:712
 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
 msgstr ""
 "La banque de sons est utilisée par certaines cartes audio, Fluidsynth et "
 "Timidity"
 
-#: gui/options.cpp:715
+#: gui/options.cpp:716
 msgid "Mixed AdLib/MIDI mode"
 msgstr "Mode mixe AdLib/MIDI"
 
-#: gui/options.cpp:715
+#: gui/options.cpp:716
 msgid "Use both MIDI and AdLib sound generation"
 msgstr "Utiliser à la fois MIDI et AdLib"
 
-#: gui/options.cpp:718
+#: gui/options.cpp:719
 msgid "True Roland MT-32 (disable GM emulation)"
 msgstr "Roland MT-32 exacte (désactive l'émulation GM)"
 
-#: gui/options.cpp:718
+#: gui/options.cpp:719
 msgid ""
 "Check if you want to use your real hardware Roland-compatible sound device "
 "connected to your computer"
@@ -562,144 +565,144 @@ msgstr ""
 "Vérifie si vous voulez utiliser un périphérique audio compatible Roland "
 "connecté à l'ordinateur"
 
-#: gui/options.cpp:721
+#: gui/options.cpp:722
 msgid "Enable Roland GS Mode"
 msgstr "Activer le mode Roland GS"
 
-#: gui/options.cpp:721
+#: gui/options.cpp:722
 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
 msgstr "Désactiver la conversion des pistes MT-32 en General MIDI"
 
-#: gui/options.cpp:724
+#: gui/options.cpp:725
 msgid "MIDI gain:"
 msgstr "Gain MIDI:"
 
-#: gui/options.cpp:737
+#: gui/options.cpp:738
 msgid "Text and Speech:"
 msgstr "Dialogue:"
 
-#: gui/options.cpp:742 gui/options.cpp:748
+#: gui/options.cpp:743 gui/options.cpp:749
 msgid "Speech"
 msgstr "Audio"
 
-#: gui/options.cpp:743 gui/options.cpp:749
+#: gui/options.cpp:744 gui/options.cpp:750
 msgid "Subtitles"
 msgstr "Sous-titres"
 
-#: gui/options.cpp:744 gui/options.cpp:750
+#: gui/options.cpp:745 gui/options.cpp:751
 msgid "Both"
 msgstr "Les deux"
 
-#: gui/options.cpp:748
+#: gui/options.cpp:749
 msgid "Spch"
 msgstr "Audio"
 
-#: gui/options.cpp:749
+#: gui/options.cpp:750
 msgid "Subs"
 msgstr "Subs"
 
-#: gui/options.cpp:750
+#: gui/options.cpp:751
 msgid "Show subtitles and play speech"
 msgstr "Affiche les sous-titres et joue les dialogues audio"
 
-#: gui/options.cpp:754
+#: gui/options.cpp:755
 msgid "Subtitle speed:"
 msgstr "Vitesse des ST:"
 
-#: gui/options.cpp:766
+#: gui/options.cpp:767
 msgid "Music volume:"
 msgstr "Volume Musique:"
 
-#: gui/options.cpp:773
+#: gui/options.cpp:774
 msgid "Mute All"
 msgstr "Silence"
 
-#: gui/options.cpp:776
+#: gui/options.cpp:777
 msgid "SFX volume:"
 msgstr "Volume Bruitage:"
 
-#: gui/options.cpp:776 gui/options.cpp:777
+#: gui/options.cpp:777 gui/options.cpp:778
 msgid "Special sound effects volume"
 msgstr "Volume des effets spéciaux sonores"
 
-#: gui/options.cpp:783
+#: gui/options.cpp:784
 msgid "Speech volume:"
 msgstr "Volume Dialogues:"
 
-#: gui/options.cpp:914
+#: gui/options.cpp:915
 msgid "Save Path: "
 msgstr "Sauvegardes:"
 
-#: gui/options.cpp:917
+#: gui/options.cpp:918
 msgid "Theme Path:"
 msgstr "Thèmes:"
 
-#: gui/options.cpp:920 gui/options.cpp:921
+#: gui/options.cpp:921 gui/options.cpp:922
 msgid "Specifies path to additional data used by all games or ScummVM"
 msgstr ""
 "Spécifie un chemin vers des données supplémentaires utilisées par tous les "
 "jeux ou ScummVM"
 
-#: gui/options.cpp:924
+#: gui/options.cpp:925
 msgid "Plugins Path:"
 msgstr "Plugins:"
 
-#: gui/options.cpp:929
+#: gui/options.cpp:930
 msgid "Misc"
 msgstr "Divers"
 
-#: gui/options.cpp:931
+#: gui/options.cpp:932
 msgid "Theme:"
 msgstr "Thème:"
 
-#: gui/options.cpp:935
+#: gui/options.cpp:936
 msgid "GUI Renderer:"
 msgstr "Interface:"
 
-#: gui/options.cpp:941
+#: gui/options.cpp:942
 msgid "Autosave:"
 msgstr "Sauvegarde auto:"
 
-#: gui/options.cpp:949
+#: gui/options.cpp:950
 msgid "Keys"
 msgstr "Touches"
 
-#: gui/options.cpp:956
+#: gui/options.cpp:957
 msgid "GUI Language:"
 msgstr "Langue:"
 
-#: gui/options.cpp:956
+#: gui/options.cpp:957
 msgid "Language of ScummVM GUI"
 msgstr "Langue de l'interface graphique de ScummVM"
 
-#: gui/options.cpp:961
+#: gui/options.cpp:962
 msgid "English"
 msgstr "Anglais"
 
-#: gui/options.cpp:1095
+#: gui/options.cpp:1106
 msgid "You have to restart ScummVM to take the effect."
 msgstr ""
 "Vous devez relancer ScummVM pour que le changement soit pris en compte."
 
-#: gui/options.cpp:1108
+#: gui/options.cpp:1119
 msgid "Select directory for savegames"
 msgstr "Sélectionner le répertoire pour les sauvegardes"
 
-#: gui/options.cpp:1115
+#: gui/options.cpp:1126
 msgid "The chosen directory cannot be written to. Please select another one."
 msgstr ""
 "Le répertoire sélectionné est vérouillé en écriture. Sélectionnez un autre "
 "répertoire."
 
-#: gui/options.cpp:1124
+#: gui/options.cpp:1135
 msgid "Select directory for GUI themes"
 msgstr "Sélectionner le répertoire des thèmes d'interface"
 
-#: gui/options.cpp:1134
+#: gui/options.cpp:1145
 msgid "Select directory for extra files"
 msgstr "Sélectionner le répertoire pour les fichiers suplémentaires"
 
-#: gui/options.cpp:1145
+#: gui/options.cpp:1156
 msgid "Select directory for plugins"
 msgstr "Sélectionner le répertoire des plugins"
 
@@ -872,6 +875,14 @@ msgstr "Echec de l'écriture des données"
 msgid "Unknown Error"
 msgstr "Erreur inconnue"
 
+#: common/util.cpp:254
+msgid "Hercules Green"
+msgstr ""
+
+#: common/util.cpp:255
+msgid "Hercules Amber"
+msgstr ""
+
 #: engines/dialogs.cpp:89
 msgid "~R~esume"
 msgstr "~R~eprendre"
@@ -952,10 +963,24 @@ msgstr "T~r~ansitions activé"
 msgid "~W~ater Effect Enabled"
 msgstr "~E~ffets de l'Eau activés"
 
+#: sound/fmopl.cpp:51
+#, fuzzy
+msgid "MAME OPL emulator"
+msgstr "Émulateur AdLib:"
+
+#: sound/fmopl.cpp:53
+msgid "DOSBox OPL emulator"
+msgstr ""
+
 #: sound/null.h:45
 msgid "No music"
 msgstr "Pas de musique"
 
+#: sound/softsynth/adlib.cpp:1590
+#, fuzzy
+msgid "AdLib Emulator"
+msgstr "Émulateur AdLib:"
+
 #: sound/softsynth/mt32.cpp:327
 #, fuzzy
 msgid "Initialising MT-32 Emulator"
@@ -966,10 +991,15 @@ msgstr "Initialisation du réseau"
 msgid "MT-32 Emulator"
 msgstr "Émulation MT-32"
 
-#: sound/softsynth/adlib.cpp:1590
+#: sound/softsynth/pcspk.cpp:142
 #, fuzzy
-msgid "AdLib Emulator"
-msgstr "Émulateur AdLib:"
+msgid "PC Speaker Emulator"
+msgstr "Haut Parleur PC"
+
+#: sound/softsynth/pcspk.cpp:161
+#, fuzzy
+msgid "IBM PCjr Emulator"
+msgstr "FM Towns"
 
 #: sound/softsynth/ym2612.cpp:762
 #, fuzzy
@@ -992,6 +1022,10 @@ msgstr "(Global)"
 msgid " (Game)"
 msgstr "(Jeu)"
 
+#: backends/midi/windows.cpp:156
+msgid "Windows MIDI"
+msgstr "MIDI Windows"
+
 #: backends/platform/ds/arm9/source/dsoptions.cpp:57
 msgid "ScummVM Main Menu"
 msgstr "Menu Principal ScummVM"
@@ -1072,6 +1106,12 @@ msgstr "Mode touchpad activé"
 msgid "Touchpad mode disabled."
 msgstr "Mode touchpad désactivé"
 
+#: backends/platform/sdl/graphics.cpp:40
+#: backends/platform/wince/wince-sdl.cpp:111
+#: backends/platform/wince/wince-sdl.cpp:118
+msgid "Normal (no scaling)"
+msgstr ""
+
 #: backends/platform/symbian/src/SymbianActions.cpp:41
 #: backends/platform/wince/CEActionsSmartphone.cpp:38
 msgid "Up"
@@ -1153,10 +1193,6 @@ msgstr "Affectation des touches"
 msgid "Do you want to quit ?"
 msgstr "Voulez-vous quitter?"
 
-#: backends/platform/wii/options.cpp:47
-msgid "Ok"
-msgstr "Ok"
-
 #: backends/platform/wii/options.cpp:51
 msgid "Video"
 msgstr "Vidéo"
@@ -1381,12 +1417,12 @@ msgstr "Affichage"
 msgid "Do you want to perform an automatic scan ?"
 msgstr "Voulez-vous exécuter une recherche automatique?"
 
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
 #~ msgid "Music driver:"
 #~ msgstr "Pilote audio:"
 
-#~ msgid "Windows MIDI"
-#~ msgstr "MIDI Windows"
-
 #~ msgid "ALSA"
 #~ msgstr "ALSA"
 
@@ -1420,9 +1456,6 @@ msgstr "Voulez-vous exécuter une recherche automatique?"
 #~ msgid "AdLib"
 #~ msgstr "AdLib"
 
-#~ msgid "PC Speaker"
-#~ msgstr "Haut Parleur PC"
-
 #~ msgid "IBM PCjr"
 #~ msgstr "IBM PCjr"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index f0ec87897a..62e18f3ae0 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -3,31 +3,31 @@
 # This file is distributed under the same license as the ScummVM package.
 # Alex Bevilacqua <alexbevi@gmail.com>, 2009.
 #
-#: sound/null.cpp:35
 msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM VERSION\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2010-06-24 23:22+0200\n"
+"POT-Creation-Date: 2010-06-26 18:15+0200\n"
 "PO-Revision-Date: 2009-11-25 07:42-0500\n"
 "Last-Translator: Alex Bevilacqua <alexbevi@gmail.com>\n"
 "Language-Team: Hungarian\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=cp1250\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gui/about.cpp:96
-msgid "C2(built on "
+#, c-format
+msgid "(built on %s)"
 msgstr ""
 
-#: gui/about.cpp:104
-msgid "C1Features compiled in:"
+#: gui/about.cpp:103
+msgid "Features compiled in:"
 msgstr ""
 
-#: gui/about.cpp:111
-msgid "C1Available engines:"
+#: gui/about.cpp:112
+msgid "Available engines:"
 msgstr ""
 
 #: gui/browser.cpp:69
@@ -39,7 +39,7 @@ msgid "Go to previous directory level"
 msgstr ""
 
 #: gui/browser.cpp:70 gui/chooser.cpp:49 gui/KeysDialog.cpp:46
-#: gui/launcher.cpp:266 gui/massadd.cpp:95 gui/options.cpp:978
+#: gui/launcher.cpp:266 gui/massadd.cpp:95 gui/options.cpp:989
 #: gui/saveload.cpp:65 gui/saveload.cpp:157 gui/themebrowser.cpp:56
 #: backends/platform/wii/options.cpp:48
 msgid "Cancel"
@@ -74,7 +74,8 @@ msgid "Map"
 msgstr ""
 
 #: gui/KeysDialog.cpp:45 gui/launcher.cpp:267 gui/launcher.cpp:873
-#: gui/launcher.cpp:877 gui/massadd.cpp:92 gui/options.cpp:979
+#: gui/launcher.cpp:877 gui/massadd.cpp:92 gui/options.cpp:990
+#: backends/platform/wii/options.cpp:47
 #: backends/platform/wince/CELauncherDialog.cpp:56
 msgid "OK"
 msgstr "Igen"
@@ -138,7 +139,7 @@ msgid ""
 msgstr ""
 
 #: gui/launcher.cpp:183 gui/launcher.cpp:194 gui/options.cpp:80
-#: gui/options.cpp:623 gui/options.cpp:633 gui/options.cpp:959
+#: gui/options.cpp:623 gui/options.cpp:633 gui/options.cpp:960
 #: sound/null.cpp:42
 msgid "<default>"
 msgstr "<alapértelmezett>"
@@ -151,11 +152,11 @@ msgstr ""
 msgid "Platform the game was originally designed for"
 msgstr ""
 
-#: gui/launcher.cpp:204 gui/options.cpp:866 gui/options.cpp:883
+#: gui/launcher.cpp:204 gui/options.cpp:867 gui/options.cpp:884
 msgid "Graphics"
 msgstr "Grafikával"
 
-#: gui/launcher.cpp:204 gui/options.cpp:866 gui/options.cpp:883
+#: gui/launcher.cpp:204 gui/options.cpp:867 gui/options.cpp:884
 msgid "GFX"
 msgstr ""
 
@@ -163,7 +164,7 @@ msgstr ""
 msgid "Override global graphic settings"
 msgstr ""
 
-#: gui/launcher.cpp:213 gui/options.cpp:889
+#: gui/launcher.cpp:213 gui/options.cpp:890
 msgid "Audio"
 msgstr "Hang"
 
@@ -171,7 +172,7 @@ msgstr "Hang"
 msgid "Override global audio settings"
 msgstr ""
 
-#: gui/launcher.cpp:223 gui/options.cpp:893
+#: gui/launcher.cpp:223 gui/options.cpp:894
 msgid "Volume"
 msgstr "Volumene"
 
@@ -179,7 +180,7 @@ msgstr "Volumene"
 msgid "Override global volume settings"
 msgstr ""
 
-#: gui/launcher.cpp:232 gui/options.cpp:901
+#: gui/launcher.cpp:232 gui/options.cpp:902
 msgid "MIDI"
 msgstr ""
 
@@ -187,7 +188,7 @@ msgstr ""
 msgid "Override global MIDI settings"
 msgstr ""
 
-#: gui/launcher.cpp:244 gui/options.cpp:907
+#: gui/launcher.cpp:244 gui/options.cpp:908
 msgid "Paths"
 msgstr "Ösvények"
 
@@ -196,7 +197,7 @@ msgstr "Ösvények"
 msgid "Game Path:"
 msgstr "Extra Útvonal:"
 
-#: gui/launcher.cpp:254 gui/options.cpp:920
+#: gui/launcher.cpp:254 gui/options.cpp:921
 msgid "Extra Path:"
 msgstr "Extra Útvonal:"
 
@@ -209,18 +210,18 @@ msgstr ""
 msgid "Save Path:"
 msgstr "Extra Útvonal:"
 
-#: gui/launcher.cpp:258 gui/launcher.cpp:259 gui/options.cpp:914
-#: gui/options.cpp:915
+#: gui/launcher.cpp:258 gui/launcher.cpp:259 gui/options.cpp:915
+#: gui/options.cpp:916
 msgid "Specifies where your savegames are put"
 msgstr ""
 
 #: gui/launcher.cpp:275 gui/launcher.cpp:353 gui/launcher.cpp:398
 #: gui/options.cpp:259 gui/options.cpp:406 gui/options.cpp:492
-#: gui/options.cpp:551 gui/options.cpp:711 gui/options.cpp:918
-#: gui/options.cpp:921 gui/options.cpp:925 gui/options.cpp:1002
-#: gui/options.cpp:1008 gui/options.cpp:1014 gui/options.cpp:1022
-#: gui/options.cpp:1046 gui/options.cpp:1050 gui/options.cpp:1056
-#: gui/options.cpp:1063 gui/options.cpp:1162
+#: gui/options.cpp:551 gui/options.cpp:712 gui/options.cpp:919
+#: gui/options.cpp:922 gui/options.cpp:926 gui/options.cpp:1013
+#: gui/options.cpp:1019 gui/options.cpp:1025 gui/options.cpp:1033
+#: gui/options.cpp:1057 gui/options.cpp:1061 gui/options.cpp:1067
+#: gui/options.cpp:1074 gui/options.cpp:1173
 msgid "None"
 msgstr "Semmi"
 
@@ -230,7 +231,7 @@ msgstr "Semmi"
 msgid "Default"
 msgstr "<alapértelmezett>"
 
-#: gui/launcher.cpp:391 gui/options.cpp:1156
+#: gui/launcher.cpp:391 gui/options.cpp:1167
 msgid "Select SoundFont"
 msgstr ""
 
@@ -322,7 +323,7 @@ msgstr ""
 msgid "Search:"
 msgstr ""
 
-#: gui/launcher.cpp:529 gui/options.cpp:712
+#: gui/launcher.cpp:529 gui/options.cpp:713
 msgid "Clear value"
 msgstr ""
 
@@ -503,188 +504,188 @@ msgid "GM Device:"
 msgstr ""
 
 #: gui/options.cpp:656
-msgid "Specifies default sound device for General Midi output"
+msgid "Specifies default sound device for General MIDI output"
 msgstr ""
 
-#: gui/options.cpp:687
+#: gui/options.cpp:688
 msgid "AdLib emulator:"
 msgstr "AdLib vezet :"
 
-#: gui/options.cpp:687 gui/options.cpp:688
+#: gui/options.cpp:688 gui/options.cpp:689
 msgid "AdLib is used for music in many games"
 msgstr ""
 
-#: gui/options.cpp:698
+#: gui/options.cpp:699
 msgid "Output rate:"
 msgstr "Kimeneti teljesítmény:"
 
-#: gui/options.cpp:698 gui/options.cpp:699
+#: gui/options.cpp:699 gui/options.cpp:700
 msgid ""
 "Higher value specifies better sound quality but may be not supported by your "
 "soundcard"
 msgstr ""
 
-#: gui/options.cpp:710
+#: gui/options.cpp:711
 msgid "SoundFont:"
 msgstr ""
 
-#: gui/options.cpp:710 gui/options.cpp:711
+#: gui/options.cpp:711 gui/options.cpp:712
 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
 msgstr ""
 
-#: gui/options.cpp:715
+#: gui/options.cpp:716
 msgid "Mixed AdLib/MIDI mode"
 msgstr "Vegyes AdLib/MIDI mód"
 
-#: gui/options.cpp:715
+#: gui/options.cpp:716
 msgid "Use both MIDI and AdLib sound generation"
 msgstr ""
 
-#: gui/options.cpp:718
+#: gui/options.cpp:719
 msgid "True Roland MT-32 (disable GM emulation)"
 msgstr "Igaz Roland MT-32 (megbénít GM emuláció)"
 
-#: gui/options.cpp:718
+#: gui/options.cpp:719
 msgid ""
 "Check if you want to use your real hardware Roland-compatible sound device "
 "connected to your computer"
 msgstr ""
 
-#: gui/options.cpp:721
+#: gui/options.cpp:722
 msgid "Enable Roland GS Mode"
 msgstr "Képessé Roland GS Mode"
 
-#: gui/options.cpp:721
+#: gui/options.cpp:722
 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
 msgstr ""
 
-#: gui/options.cpp:724
+#: gui/options.cpp:725
 msgid "MIDI gain:"
 msgstr "MIDI nyereség:"
 
-#: gui/options.cpp:737
+#: gui/options.cpp:738
 msgid "Text and Speech:"
 msgstr "Szöveg és beszéd:"
 
-#: gui/options.cpp:742 gui/options.cpp:748
+#: gui/options.cpp:743 gui/options.cpp:749
 #, fuzzy
 msgid "Speech"
 msgstr "Csak a beszéd"
 
-#: gui/options.cpp:743 gui/options.cpp:749
+#: gui/options.cpp:744 gui/options.cpp:750
 #, fuzzy
 msgid "Subtitles"
 msgstr "Csak feliratok"
 
-#: gui/options.cpp:744 gui/options.cpp:750
+#: gui/options.cpp:745 gui/options.cpp:751
 msgid "Both"
 msgstr ""
 
-#: gui/options.cpp:748
+#: gui/options.cpp:749
 msgid "Spch"
 msgstr ""
 
-#: gui/options.cpp:749
+#: gui/options.cpp:750
 msgid "Subs"
 msgstr ""
 
-#: gui/options.cpp:750
+#: gui/options.cpp:751
 msgid "Show subtitles and play speech"
 msgstr ""
 
-#: gui/options.cpp:754
+#: gui/options.cpp:755
 msgid "Subtitle speed:"
 msgstr "Felirat sebesség:"
 
-#: gui/options.cpp:766
+#: gui/options.cpp:767
 msgid "Music volume:"
 msgstr "Zene mennyiség:"
 
-#: gui/options.cpp:773
+#: gui/options.cpp:774
 msgid "Mute All"
 msgstr "Muta Összes"
 
-#: gui/options.cpp:776
+#: gui/options.cpp:777
 msgid "SFX volume:"
 msgstr "SFX mennyisége"
 
-#: gui/options.cpp:776 gui/options.cpp:777
+#: gui/options.cpp:777 gui/options.cpp:778
 msgid "Special sound effects volume"
 msgstr ""
 
-#: gui/options.cpp:783
+#: gui/options.cpp:784
 msgid "Speech volume:"
 msgstr "Beszéd mennyiség:"
 
-#: gui/options.cpp:914
+#: gui/options.cpp:915
 msgid "Save Path: "
 msgstr ""
 
-#: gui/options.cpp:917
+#: gui/options.cpp:918
 msgid "Theme Path:"
 msgstr ""
 
-#: gui/options.cpp:920 gui/options.cpp:921
+#: gui/options.cpp:921 gui/options.cpp:922
 msgid "Specifies path to additional data used by all games or ScummVM"
 msgstr ""
 
-#: gui/options.cpp:924
+#: gui/options.cpp:925
 msgid "Plugins Path:"
 msgstr ""
 
-#: gui/options.cpp:929
+#: gui/options.cpp:930
 msgid "Misc"
 msgstr ""
 
-#: gui/options.cpp:931
+#: gui/options.cpp:932
 msgid "Theme:"
 msgstr "Téma:"
 
-#: gui/options.cpp:935
+#: gui/options.cpp:936
 msgid "GUI Renderer:"
 msgstr "Leképez eszköz GUI:"
 
-#: gui/options.cpp:941
+#: gui/options.cpp:942
 msgid "Autosave:"
 msgstr "Automatikus mentés:"
 
-#: gui/options.cpp:949
+#: gui/options.cpp:950
 msgid "Keys"
 msgstr "Kulcsok"
 
-#: gui/options.cpp:956
+#: gui/options.cpp:957
 msgid "GUI Language:"
 msgstr ""
 
-#: gui/options.cpp:956
+#: gui/options.cpp:957
 msgid "Language of ScummVM GUI"
 msgstr ""
 
-#: gui/options.cpp:961
+#: gui/options.cpp:962
 msgid "English"
 msgstr ""
 
-#: gui/options.cpp:1095
+#: gui/options.cpp:1106
 msgid "You have to restart ScummVM to take the effect."
 msgstr ""
 
-#: gui/options.cpp:1108
+#: gui/options.cpp:1119
 msgid "Select directory for savegames"
 msgstr ""
 
-#: gui/options.cpp:1115
+#: gui/options.cpp:1126
 msgid "The chosen directory cannot be written to. Please select another one."
 msgstr ""
 
-#: gui/options.cpp:1124
+#: gui/options.cpp:1135
 msgid "Select directory for GUI themes"
 msgstr ""
 
-#: gui/options.cpp:1134
+#: gui/options.cpp:1145
 msgid "Select directory for extra files"
 msgstr ""
 
-#: gui/options.cpp:1145
+#: gui/options.cpp:1156
 msgid "Select directory for plugins"
 msgstr ""
 
@@ -855,6 +856,14 @@ msgstr ""
 msgid "Unknown Error"
 msgstr ""
 
+#: common/util.cpp:254
+msgid "Hercules Green"
+msgstr ""
+
+#: common/util.cpp:255
+msgid "Hercules Amber"
+msgstr ""
+
 #: engines/dialogs.cpp:89
 msgid "~R~esume"
 msgstr ""
@@ -936,10 +945,24 @@ msgstr ""
 msgid "~W~ater Effect Enabled"
 msgstr ""
 
+#: sound/fmopl.cpp:51
+#, fuzzy
+msgid "MAME OPL emulator"
+msgstr "AdLib vezet :"
+
+#: sound/fmopl.cpp:53
+msgid "DOSBox OPL emulator"
+msgstr ""
+
 #: sound/null.h:45
 msgid "No music"
 msgstr ""
 
+#: sound/softsynth/adlib.cpp:1590
+#, fuzzy
+msgid "AdLib Emulator"
+msgstr "AdLib vezet :"
+
 #: sound/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr ""
@@ -948,10 +971,13 @@ msgstr ""
 msgid "MT-32 Emulator"
 msgstr ""
 
-#: sound/softsynth/adlib.cpp:1590
-#, fuzzy
-msgid "AdLib Emulator"
-msgstr "AdLib vezet :"
+#: sound/softsynth/pcspk.cpp:142
+msgid "PC Speaker Emulator"
+msgstr ""
+
+#: sound/softsynth/pcspk.cpp:161
+msgid "IBM PCjr Emulator"
+msgstr ""
 
 #: sound/softsynth/ym2612.cpp:762
 msgid "FM Towns Emulator"
@@ -973,6 +999,10 @@ msgstr ""
 msgid " (Game)"
 msgstr ""
 
+#: backends/midi/windows.cpp:156
+msgid "Windows MIDI"
+msgstr ""
+
 #: backends/platform/ds/arm9/source/dsoptions.cpp:57
 msgid "ScummVM Main Menu"
 msgstr ""
@@ -1054,6 +1084,12 @@ msgstr ""
 msgid "Touchpad mode disabled."
 msgstr ""
 
+#: backends/platform/sdl/graphics.cpp:40
+#: backends/platform/wince/wince-sdl.cpp:111
+#: backends/platform/wince/wince-sdl.cpp:118
+msgid "Normal (no scaling)"
+msgstr ""
+
 #: backends/platform/symbian/src/SymbianActions.cpp:41
 #: backends/platform/wince/CEActionsSmartphone.cpp:38
 msgid "Up"
@@ -1136,10 +1172,6 @@ msgstr ""
 msgid "Do you want to quit ?"
 msgstr ""
 
-#: backends/platform/wii/options.cpp:47
-msgid "Ok"
-msgstr ""
-
 #: backends/platform/wii/options.cpp:51
 msgid "Video"
 msgstr ""
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 727af8219b..31284b45df 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -3,32 +3,34 @@
 # This file is distributed under the same license as the ScummVM package.
 # Eugene Sandulenko <sev@scummvm.org>, 2010.
 #
-#: sound/null.cpp:35
 msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM VERSION\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2010-06-24 23:22+0200\n"
+"POT-Creation-Date: 2010-06-26 18:15+0200\n"
 "PO-Revision-Date: 2010-06-13 20:55+0300\n"
 "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n"
 "Language-Team: Russian\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=cp1251\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-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"
+"Language: \n"
+"Plural-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"
 
 #: gui/about.cpp:96
-msgid "C2(built on "
+#, fuzzy, c-format
+msgid "(built on %s)"
 msgstr "C2(ñîáðàí "
 
-#: gui/about.cpp:104
-msgid "C1Features compiled in:"
+#: gui/about.cpp:103
+#, fuzzy
+msgid "Features compiled in:"
 msgstr "C1Âêëþ÷åííûå â áèëä îïöèè:"
 
-#: gui/about.cpp:111
-msgid "C1Available engines:"
+#: gui/about.cpp:112
+#, fuzzy
+msgid "Available engines:"
 msgstr "C1Äîñòóïíûå äâèæêè:"
 
 #: gui/browser.cpp:69
@@ -40,7 +42,7 @@ msgid "Go to previous directory level"
 msgstr "Ïåðåéòè íà äèðåêòîðèþ óðîâíåì âûøå"
 
 #: gui/browser.cpp:70 gui/chooser.cpp:49 gui/KeysDialog.cpp:46
-#: gui/launcher.cpp:266 gui/massadd.cpp:95 gui/options.cpp:978
+#: gui/launcher.cpp:266 gui/massadd.cpp:95 gui/options.cpp:989
 #: gui/saveload.cpp:65 gui/saveload.cpp:157 gui/themebrowser.cpp:56
 #: backends/platform/wii/options.cpp:48
 msgid "Cancel"
@@ -75,7 +77,8 @@ msgid "Map"
 msgstr "Íàçíà÷èòü"
 
 #: gui/KeysDialog.cpp:45 gui/launcher.cpp:267 gui/launcher.cpp:873
-#: gui/launcher.cpp:877 gui/massadd.cpp:92 gui/options.cpp:979
+#: gui/launcher.cpp:877 gui/massadd.cpp:92 gui/options.cpp:990
+#: backends/platform/wii/options.cpp:47
 #: backends/platform/wince/CELauncherDialog.cpp:56
 msgid "OK"
 msgstr "OK"
@@ -143,7 +146,7 @@ msgstr ""
 "ðóññêóþ"
 
 #: gui/launcher.cpp:183 gui/launcher.cpp:194 gui/options.cpp:80
-#: gui/options.cpp:623 gui/options.cpp:633 gui/options.cpp:959
+#: gui/options.cpp:623 gui/options.cpp:633 gui/options.cpp:960
 #: sound/null.cpp:42
 msgid "<default>"
 msgstr "<ïî óìîë÷àíèþ>"
@@ -156,11 +159,11 @@ msgstr "Ïëàòôîðìà:"
 msgid "Platform the game was originally designed for"
 msgstr "Ïëàòôîðìà, äëÿ êîòîðîé èãðà áûëà èçíà÷àëüíî ðàçðàáîòàíà"
 
-#: gui/launcher.cpp:204 gui/options.cpp:866 gui/options.cpp:883
+#: gui/launcher.cpp:204 gui/options.cpp:867 gui/options.cpp:884
 msgid "Graphics"
 msgstr "Ãðàôèêà"
 
-#: gui/launcher.cpp:204 gui/options.cpp:866 gui/options.cpp:883
+#: gui/launcher.cpp:204 gui/options.cpp:867 gui/options.cpp:884
 msgid "GFX"
 msgstr "Ãðô"
 
@@ -168,7 +171,7 @@ msgstr "Ãðô"
 msgid "Override global graphic settings"
 msgstr "Ïåðåêðûòü ãëîáàëüíûå óñòàíîâêè ãðàôèêè"
 
-#: gui/launcher.cpp:213 gui/options.cpp:889
+#: gui/launcher.cpp:213 gui/options.cpp:890
 msgid "Audio"
 msgstr "Àóäèî"
 
@@ -176,7 +179,7 @@ msgstr "Àóäèî"
 msgid "Override global audio settings"
 msgstr "Ïåðåêðûòü ãëîáàëüíûå óñòàíîâêè àóäèî"
 
-#: gui/launcher.cpp:223 gui/options.cpp:893
+#: gui/launcher.cpp:223 gui/options.cpp:894
 msgid "Volume"
 msgstr "Ãðîìêîñòü"
 
@@ -184,7 +187,7 @@ msgstr "Ãðîìêîñòü"
 msgid "Override global volume settings"
 msgstr "Ïåðåêðûòü ãëîáàëüíûå óñòàíîâêè ãðîìêîñòè"
 
-#: gui/launcher.cpp:232 gui/options.cpp:901
+#: gui/launcher.cpp:232 gui/options.cpp:902
 msgid "MIDI"
 msgstr "MIDI"
 
@@ -192,7 +195,7 @@ msgstr "MIDI"
 msgid "Override global MIDI settings"
 msgstr "Ïåðåêðûòü ãëîáàëüíûå óñòàíîâêè MIDI"
 
-#: gui/launcher.cpp:244 gui/options.cpp:907
+#: gui/launcher.cpp:244 gui/options.cpp:908
 msgid "Paths"
 msgstr "Ïóòè"
 
@@ -200,7 +203,7 @@ msgstr "Ïóòè"
 msgid "Game Path:"
 msgstr "Ïóòü ê èãðå: "
 
-#: gui/launcher.cpp:254 gui/options.cpp:920
+#: gui/launcher.cpp:254 gui/options.cpp:921
 msgid "Extra Path:"
 msgstr "Äîï. ïóòü:"
 
@@ -212,18 +215,18 @@ msgstr "Óêàçûâàåò ïóòü ê äîïîëíèòåëüíûì ôàéëàì äàííûõ äëÿ èãðû"
 msgid "Save Path:"
 msgstr "Ïóòü ñîõð.: "
 
-#: gui/launcher.cpp:258 gui/launcher.cpp:259 gui/options.cpp:914
-#: gui/options.cpp:915
+#: gui/launcher.cpp:258 gui/launcher.cpp:259 gui/options.cpp:915
+#: gui/options.cpp:916
 msgid "Specifies where your savegames are put"
 msgstr "Óêàçûâàåò ïóòü ê ñîõðàíåíèÿì èãðû"
 
 #: gui/launcher.cpp:275 gui/launcher.cpp:353 gui/launcher.cpp:398
 #: gui/options.cpp:259 gui/options.cpp:406 gui/options.cpp:492
-#: gui/options.cpp:551 gui/options.cpp:711 gui/options.cpp:918
-#: gui/options.cpp:921 gui/options.cpp:925 gui/options.cpp:1002
-#: gui/options.cpp:1008 gui/options.cpp:1014 gui/options.cpp:1022
-#: gui/options.cpp:1046 gui/options.cpp:1050 gui/options.cpp:1056
-#: gui/options.cpp:1063 gui/options.cpp:1162
+#: gui/options.cpp:551 gui/options.cpp:712 gui/options.cpp:919
+#: gui/options.cpp:922 gui/options.cpp:926 gui/options.cpp:1013
+#: gui/options.cpp:1019 gui/options.cpp:1025 gui/options.cpp:1033
+#: gui/options.cpp:1057 gui/options.cpp:1061 gui/options.cpp:1067
+#: gui/options.cpp:1074 gui/options.cpp:1173
 msgid "None"
 msgstr "Íå çàäàí"
 
@@ -232,7 +235,7 @@ msgstr "Íå çàäàí"
 msgid "Default"
 msgstr "Ïî óìîë÷àíèþ"
 
-#: gui/launcher.cpp:391 gui/options.cpp:1156
+#: gui/launcher.cpp:391 gui/options.cpp:1167
 msgid "Select SoundFont"
 msgstr "Âûáåðèòå SoundFont"
 
@@ -324,7 +327,7 @@ msgstr "Ïîèñê â ñïèñêå èãð"
 msgid "Search:"
 msgstr "Ïîèñê:"
 
-#: gui/launcher.cpp:529 gui/options.cpp:712
+#: gui/launcher.cpp:529 gui/options.cpp:713
 msgid "Clear value"
 msgstr "Î÷èñòèòü çíà÷åíèå"
 
@@ -508,22 +511,22 @@ msgstr ""
 
 #: gui/options.cpp:656
 #, fuzzy
-msgid "Specifies default sound device for General Midi output"
+msgid "Specifies default sound device for General MIDI output"
 msgstr "Óêàçûâàåò âûõîäíîå óñòðîéñòâî äëÿ çâóêà èëè ýìóëÿòîð çâóêîâîé êàðòû"
 
-#: gui/options.cpp:687
+#: gui/options.cpp:688
 msgid "AdLib emulator:"
 msgstr "Ýìóëÿòîð AdLib:"
 
-#: gui/options.cpp:687 gui/options.cpp:688
+#: gui/options.cpp:688 gui/options.cpp:689
 msgid "AdLib is used for music in many games"
 msgstr "Çâóêîâàÿ êàðòà AdLib èñïîëüçóåòñÿ ìíîãèìè èãðàìè"
 
-#: gui/options.cpp:698
+#: gui/options.cpp:699
 msgid "Output rate:"
 msgstr "Âûõîäíàÿ ÷àñòîòà:"
 
-#: gui/options.cpp:698 gui/options.cpp:699
+#: gui/options.cpp:699 gui/options.cpp:700
 msgid ""
 "Higher value specifies better sound quality but may be not supported by your "
 "soundcard"
@@ -531,29 +534,29 @@ msgstr ""
 "ÁÎëüøèå çíà÷åíèÿ çàäàþò ëó÷øåå êà÷åñòâî çâóêà, îäíàêî îíè ìîãóò íå "
 "ïîääåðæèâàòüñÿ âàøåé çâóêîâîé êàðòîé"
 
-#: gui/options.cpp:710
+#: gui/options.cpp:711
 msgid "SoundFont:"
 msgstr "SoundFont:"
 
-#: gui/options.cpp:710 gui/options.cpp:711
+#: gui/options.cpp:711 gui/options.cpp:712
 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
 msgstr ""
 "SoundFontû ïîääåðäæèâàþòñÿ íåêîòîðûìè çâóêîâûìè êàðòàìè, Fluidsynth è "
 "Timidity"
 
-#: gui/options.cpp:715
+#: gui/options.cpp:716
 msgid "Mixed AdLib/MIDI mode"
 msgstr "Ñìåøàííûé ðåæèì AdLib/MIDI"
 
-#: gui/options.cpp:715
+#: gui/options.cpp:716
 msgid "Use both MIDI and AdLib sound generation"
 msgstr "Èñïîëüçîâàòü è MIDI è AdLib äëÿ ãåíåðàöèè çâóêà"
 
-#: gui/options.cpp:718
+#: gui/options.cpp:719
 msgid "True Roland MT-32 (disable GM emulation)"
 msgstr "Íàñòîÿùèé Roland MT-32 (çàïðåòèòü ýìóëÿöèþ GM)"
 
-#: gui/options.cpp:718
+#: gui/options.cpp:719
 msgid ""
 "Check if you want to use your real hardware Roland-compatible sound device "
 "connected to your computer"
@@ -561,142 +564,142 @@ msgstr ""
 "Îòìåòüòå åñëè ó âàñ ïîäêëþ÷åíî Roland-ñîâìåñòèìîå çâóêîâîå óñòðîéñòâî è âû "
 "õîòèòå åãî èñïîëüçîâàòü"
 
-#: gui/options.cpp:721
+#: gui/options.cpp:722
 msgid "Enable Roland GS Mode"
 msgstr "Âêëþ÷èòü ðåæèì Roland GS"
 
-#: gui/options.cpp:721
+#: gui/options.cpp:722
 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
 msgstr ""
 "Âûêëþ÷àåò ìàïïèíã General MIDI äëÿ èãð ñ çâóêîâîé äîðîæêîé äëÿ Roland MT-32"
 
-#: gui/options.cpp:724
+#: gui/options.cpp:725
 msgid "MIDI gain:"
 msgstr "Óñèëåíèå MIDI:"
 
-#: gui/options.cpp:737
+#: gui/options.cpp:738
 msgid "Text and Speech:"
 msgstr "Òåêñò è îçâó÷êà:"
 
-#: gui/options.cpp:742 gui/options.cpp:748
+#: gui/options.cpp:743 gui/options.cpp:749
 msgid "Speech"
 msgstr "Îçâó÷êà"
 
-#: gui/options.cpp:743 gui/options.cpp:749
+#: gui/options.cpp:744 gui/options.cpp:750
 msgid "Subtitles"
 msgstr "Ñóáòèòðû"
 
-#: gui/options.cpp:744 gui/options.cpp:750
+#: gui/options.cpp:745 gui/options.cpp:751
 msgid "Both"
 msgstr "Âñ¸"
 
-#: gui/options.cpp:748
+#: gui/options.cpp:749
 msgid "Spch"
 msgstr "Îçâ"
 
-#: gui/options.cpp:749
+#: gui/options.cpp:750
 msgid "Subs"
 msgstr "Ñóá"
 
-#: gui/options.cpp:750
+#: gui/options.cpp:751
 msgid "Show subtitles and play speech"
 msgstr "Ïîêàçûâàòü ñóáòèòðû è âîñïðîèçâîäèòü ðå÷ü"
 
-#: gui/options.cpp:754
+#: gui/options.cpp:755
 msgid "Subtitle speed:"
 msgstr "Ñêîðîñòü ñóáòèòðîâ:"
 
-#: gui/options.cpp:766
+#: gui/options.cpp:767
 msgid "Music volume:"
 msgstr "Ãðîìêîñòü ìóçûêè:"
 
-#: gui/options.cpp:773
+#: gui/options.cpp:774
 msgid "Mute All"
 msgstr "Âûêëþ÷èòü âñ¸"
 
-#: gui/options.cpp:776
+#: gui/options.cpp:777
 msgid "SFX volume:"
 msgstr "Ãðîìêîñòü ýôôåêòîâ:"
 
-#: gui/options.cpp:776 gui/options.cpp:777
+#: gui/options.cpp:777 gui/options.cpp:778
 msgid "Special sound effects volume"
 msgstr "Ãðîìêîñòü ñïåöèàëüíûõ çâóêîâûõ ýôôåêòîâ"
 
-#: gui/options.cpp:783
+#: gui/options.cpp:784
 msgid "Speech volume:"
 msgstr "Ãðîìêîñòü îçâó÷êè:"
 
-#: gui/options.cpp:914
+#: gui/options.cpp:915
 msgid "Save Path: "
 msgstr "Ïóòü äëÿ ñîõðàíåíèé: "
 
-#: gui/options.cpp:917
+#: gui/options.cpp:918
 msgid "Theme Path:"
 msgstr "Ïóòü ê òåìàì:"
 
-#: gui/options.cpp:920 gui/options.cpp:921
+#: gui/options.cpp:921 gui/options.cpp:922
 msgid "Specifies path to additional data used by all games or ScummVM"
 msgstr ""
 "Óêàçûâàåò ïóòü ê äîïîëíèòåëüíûì ôàéëàì äàííûõ, èñïîëüçóåìûõ âñåìè èãðàìè, "
 "ëèáî ScummVM"
 
-#: gui/options.cpp:924
+#: gui/options.cpp:925
 msgid "Plugins Path:"
 msgstr "Ïóòü ê ïëàãèíàì:"
 
-#: gui/options.cpp:929
+#: gui/options.cpp:930
 msgid "Misc"
 msgstr "Ðàçíîå"
 
-#: gui/options.cpp:931
+#: gui/options.cpp:932
 msgid "Theme:"
 msgstr "Òåìà:"
 
-#: gui/options.cpp:935
+#: gui/options.cpp:936
 msgid "GUI Renderer:"
 msgstr "Ðàñòåðèçàòîð GUI:"
 
-#: gui/options.cpp:941
+#: gui/options.cpp:942
 msgid "Autosave:"
 msgstr "Àâòîñîõðàíåíèå:"
 
-#: gui/options.cpp:949
+#: gui/options.cpp:950
 msgid "Keys"
 msgstr "Êëàâèøè"
 
-#: gui/options.cpp:956
+#: gui/options.cpp:957
 msgid "GUI Language:"
 msgstr "ßçûê èíòåðôåéñà:"
 
-#: gui/options.cpp:956
+#: gui/options.cpp:957
 msgid "Language of ScummVM GUI"
 msgstr "ßçûê ãðàôè÷åñêîãî èíòåðôåéñà ScummVM"
 
-#: gui/options.cpp:961
+#: gui/options.cpp:962
 msgid "English"
 msgstr "English"
 
-#: gui/options.cpp:1095
+#: gui/options.cpp:1106
 msgid "You have to restart ScummVM to take the effect."
 msgstr "Âû äîëæíû ïåðåçàïóñòèòü ScummVM ÷òîáû ïðèìåíèòü èçìåíåíèÿ."
 
-#: gui/options.cpp:1108
+#: gui/options.cpp:1119
 msgid "Select directory for savegames"
 msgstr "Âûáåðèòå äèðåêòîðèþ äëÿ ñîõðàíåíèé"
 
-#: gui/options.cpp:1115
+#: gui/options.cpp:1126
 msgid "The chosen directory cannot be written to. Please select another one."
 msgstr "Íå ìîãó ïèñàòü â âûáðàííóþ äèðåêòîðèþ. Ïîæàëóéñòà, óêàæèòå äðóãóþ."
 
-#: gui/options.cpp:1124
+#: gui/options.cpp:1135
 msgid "Select directory for GUI themes"
 msgstr "Âûáåðèòå äèðåêòîðèþ äëÿ òåì GUI"
 
-#: gui/options.cpp:1134
+#: gui/options.cpp:1145
 msgid "Select directory for extra files"
 msgstr "Âûáåðèòå äèðåêòîðèþ ñ äîïîëíèòåëüíûìè ôàéëàìè"
 
-#: gui/options.cpp:1145
+#: gui/options.cpp:1156
 msgid "Select directory for plugins"
 msgstr "Âûáåðèòå äèðåêòîðèþ ñ ïëàãèíàìè"
 
@@ -867,6 +870,14 @@ msgstr "Îøèáêà çàïèñè äàííûõ"
 msgid "Unknown Error"
 msgstr "Íåèçâåñòíàÿ îøèáêà"
 
+#: common/util.cpp:254
+msgid "Hercules Green"
+msgstr ""
+
+#: common/util.cpp:255
+msgid "Hercules Amber"
+msgstr ""
+
 #: engines/dialogs.cpp:89
 msgid "~R~esume"
 msgstr "Ïðîäîë~æ~èòü"
@@ -946,10 +957,24 @@ msgstr "Ïåðåõîäû àêòèâèðîâàíû"
 msgid "~W~ater Effect Enabled"
 msgstr "Ýôôåêòû âîäû âêëþ÷åíû"
 
+#: sound/fmopl.cpp:51
+#, fuzzy
+msgid "MAME OPL emulator"
+msgstr "Ýìóëÿòîð AdLib:"
+
+#: sound/fmopl.cpp:53
+msgid "DOSBox OPL emulator"
+msgstr ""
+
 #: sound/null.h:45
 msgid "No music"
 msgstr "Áåç ìóçûêè"
 
+#: sound/softsynth/adlib.cpp:1590
+#, fuzzy
+msgid "AdLib Emulator"
+msgstr "Ýìóëÿòîð AdLib:"
+
 #: sound/softsynth/mt32.cpp:327
 #, fuzzy
 msgid "Initialising MT-32 Emulator"
@@ -960,10 +985,15 @@ msgstr "Íàñòðàèâàþ ñåòü"
 msgid "MT-32 Emulator"
 msgstr "Ýìóëÿöèÿ MT-32"
 
-#: sound/softsynth/adlib.cpp:1590
+#: sound/softsynth/pcspk.cpp:142
 #, fuzzy
-msgid "AdLib Emulator"
-msgstr "Ýìóëÿòîð AdLib:"
+msgid "PC Speaker Emulator"
+msgstr "PC ñïèêåð"
+
+#: sound/softsynth/pcspk.cpp:161
+#, fuzzy
+msgid "IBM PCjr Emulator"
+msgstr "FM Towns"
 
 #: sound/softsynth/ym2612.cpp:762
 #, fuzzy
@@ -986,6 +1016,10 @@ msgstr " (Ãëîáàëüíàÿ)"
 msgid " (Game)"
 msgstr " (Èãðû)"
 
+#: backends/midi/windows.cpp:156
+msgid "Windows MIDI"
+msgstr "Windows MIDI"
+
 #: backends/platform/ds/arm9/source/dsoptions.cpp:57
 msgid "ScummVM Main Menu"
 msgstr "Ãëàâíîå ìåíþ ScummVM"
@@ -1066,6 +1100,12 @@ msgstr "Ðåæèì òà÷ïàäà âêëþ÷åí."
 msgid "Touchpad mode disabled."
 msgstr "Ðåæèì òà÷ïàäà âûêëþ÷åí."
 
+#: backends/platform/sdl/graphics.cpp:40
+#: backends/platform/wince/wince-sdl.cpp:111
+#: backends/platform/wince/wince-sdl.cpp:118
+msgid "Normal (no scaling)"
+msgstr ""
+
 #: backends/platform/symbian/src/SymbianActions.cpp:41
 #: backends/platform/wince/CEActionsSmartphone.cpp:38
 msgid "Up"
@@ -1146,10 +1186,6 @@ msgstr "Íàçíà÷åíèå êëàâèø"
 msgid "Do you want to quit ?"
 msgstr "Âû õîòèòå âûéòè?"
 
-#: backends/platform/wii/options.cpp:47
-msgid "Ok"
-msgstr "Ok"
-
 #: backends/platform/wii/options.cpp:51
 msgid "Video"
 msgstr "Âèäåî"
@@ -1362,12 +1398,12 @@ msgstr "Ïîêàçàòü "
 msgid "Do you want to perform an automatic scan ?"
 msgstr "Âû õîòèòå ïðîèçâåñòè àâòîìàòè÷åñêèé ïîèñê?"
 
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
 #~ msgid "Music driver:"
 #~ msgstr "Äðàéâåð ìóçûêè:"
 
-#~ msgid "Windows MIDI"
-#~ msgstr "Windows MIDI"
-
 #~ msgid "ALSA"
 #~ msgstr "ALSA"
 
@@ -1401,9 +1437,6 @@ msgstr "Âû õîòèòå ïðîèçâåñòè àâòîìàòè÷åñêèé ïîèñê?"
 #~ msgid "AdLib"
 #~ msgstr "AdLib"
 
-#~ msgid "PC Speaker"
-#~ msgstr "PC ñïèêåð"
-
 #~ msgid "IBM PCjr"
 #~ msgstr "IBM PCjr"
 
diff --git a/po/scummvm.pot b/po/scummvm.pot
index b796a7d384..b8f164e1ba 100644
--- a/po/scummvm.pot
+++ b/po/scummvm.pot
@@ -3,31 +3,30 @@
 # This file is distributed under the same license as the ScummVM package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: sound/null.cpp:35
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.2.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2010-06-24 23:22+0200\n"
+"POT-Creation-Date: 2010-06-26 18:15+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: gui/about.cpp:96
-msgid "C2(built on "
+#, c-format
+msgid "(built on %s)"
 msgstr ""
 
-#: gui/about.cpp:104
-msgid "C1Features compiled in:"
+#: gui/about.cpp:103
+msgid "Features compiled in:"
 msgstr ""
 
-#: gui/about.cpp:111
-msgid "C1Available engines:"
+#: gui/about.cpp:112
+msgid "Available engines:"
 msgstr ""
 
 #: gui/browser.cpp:69
@@ -39,7 +38,7 @@ msgid "Go to previous directory level"
 msgstr ""
 
 #: gui/browser.cpp:70 gui/chooser.cpp:49 gui/KeysDialog.cpp:46
-#: gui/launcher.cpp:266 gui/massadd.cpp:95 gui/options.cpp:978
+#: gui/launcher.cpp:266 gui/massadd.cpp:95 gui/options.cpp:989
 #: gui/saveload.cpp:65 gui/saveload.cpp:157 gui/themebrowser.cpp:56
 #: backends/platform/wii/options.cpp:48
 msgid "Cancel"
@@ -74,7 +73,8 @@ msgid "Map"
 msgstr ""
 
 #: gui/KeysDialog.cpp:45 gui/launcher.cpp:267 gui/launcher.cpp:873
-#: gui/launcher.cpp:877 gui/massadd.cpp:92 gui/options.cpp:979
+#: gui/launcher.cpp:877 gui/massadd.cpp:92 gui/options.cpp:990
+#: backends/platform/wii/options.cpp:47
 #: backends/platform/wince/CELauncherDialog.cpp:56
 msgid "OK"
 msgstr ""
@@ -138,7 +138,7 @@ msgid ""
 msgstr ""
 
 #: gui/launcher.cpp:183 gui/launcher.cpp:194 gui/options.cpp:80
-#: gui/options.cpp:623 gui/options.cpp:633 gui/options.cpp:959
+#: gui/options.cpp:623 gui/options.cpp:633 gui/options.cpp:960
 #: sound/null.cpp:42
 msgid "<default>"
 msgstr ""
@@ -151,11 +151,11 @@ msgstr ""
 msgid "Platform the game was originally designed for"
 msgstr ""
 
-#: gui/launcher.cpp:204 gui/options.cpp:866 gui/options.cpp:883
+#: gui/launcher.cpp:204 gui/options.cpp:867 gui/options.cpp:884
 msgid "Graphics"
 msgstr ""
 
-#: gui/launcher.cpp:204 gui/options.cpp:866 gui/options.cpp:883
+#: gui/launcher.cpp:204 gui/options.cpp:867 gui/options.cpp:884
 msgid "GFX"
 msgstr ""
 
@@ -163,7 +163,7 @@ msgstr ""
 msgid "Override global graphic settings"
 msgstr ""
 
-#: gui/launcher.cpp:213 gui/options.cpp:889
+#: gui/launcher.cpp:213 gui/options.cpp:890
 msgid "Audio"
 msgstr ""
 
@@ -171,7 +171,7 @@ msgstr ""
 msgid "Override global audio settings"
 msgstr ""
 
-#: gui/launcher.cpp:223 gui/options.cpp:893
+#: gui/launcher.cpp:223 gui/options.cpp:894
 msgid "Volume"
 msgstr ""
 
@@ -179,7 +179,7 @@ msgstr ""
 msgid "Override global volume settings"
 msgstr ""
 
-#: gui/launcher.cpp:232 gui/options.cpp:901
+#: gui/launcher.cpp:232 gui/options.cpp:902
 msgid "MIDI"
 msgstr ""
 
@@ -187,7 +187,7 @@ msgstr ""
 msgid "Override global MIDI settings"
 msgstr ""
 
-#: gui/launcher.cpp:244 gui/options.cpp:907
+#: gui/launcher.cpp:244 gui/options.cpp:908
 msgid "Paths"
 msgstr ""
 
@@ -195,7 +195,7 @@ msgstr ""
 msgid "Game Path:"
 msgstr ""
 
-#: gui/launcher.cpp:254 gui/options.cpp:920
+#: gui/launcher.cpp:254 gui/options.cpp:921
 msgid "Extra Path:"
 msgstr ""
 
@@ -207,18 +207,18 @@ msgstr ""
 msgid "Save Path:"
 msgstr ""
 
-#: gui/launcher.cpp:258 gui/launcher.cpp:259 gui/options.cpp:914
-#: gui/options.cpp:915
+#: gui/launcher.cpp:258 gui/launcher.cpp:259 gui/options.cpp:915
+#: gui/options.cpp:916
 msgid "Specifies where your savegames are put"
 msgstr ""
 
 #: gui/launcher.cpp:275 gui/launcher.cpp:353 gui/launcher.cpp:398
 #: gui/options.cpp:259 gui/options.cpp:406 gui/options.cpp:492
-#: gui/options.cpp:551 gui/options.cpp:711 gui/options.cpp:918
-#: gui/options.cpp:921 gui/options.cpp:925 gui/options.cpp:1002
-#: gui/options.cpp:1008 gui/options.cpp:1014 gui/options.cpp:1022
-#: gui/options.cpp:1046 gui/options.cpp:1050 gui/options.cpp:1056
-#: gui/options.cpp:1063 gui/options.cpp:1162
+#: gui/options.cpp:551 gui/options.cpp:712 gui/options.cpp:919
+#: gui/options.cpp:922 gui/options.cpp:926 gui/options.cpp:1013
+#: gui/options.cpp:1019 gui/options.cpp:1025 gui/options.cpp:1033
+#: gui/options.cpp:1057 gui/options.cpp:1061 gui/options.cpp:1067
+#: gui/options.cpp:1074 gui/options.cpp:1173
 msgid "None"
 msgstr ""
 
@@ -227,7 +227,7 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: gui/launcher.cpp:391 gui/options.cpp:1156
+#: gui/launcher.cpp:391 gui/options.cpp:1167
 msgid "Select SoundFont"
 msgstr ""
 
@@ -319,7 +319,7 @@ msgstr ""
 msgid "Search:"
 msgstr ""
 
-#: gui/launcher.cpp:529 gui/options.cpp:712
+#: gui/launcher.cpp:529 gui/options.cpp:713
 msgid "Clear value"
 msgstr ""
 
@@ -499,186 +499,186 @@ msgid "GM Device:"
 msgstr ""
 
 #: gui/options.cpp:656
-msgid "Specifies default sound device for General Midi output"
+msgid "Specifies default sound device for General MIDI output"
 msgstr ""
 
-#: gui/options.cpp:687
+#: gui/options.cpp:688
 msgid "AdLib emulator:"
 msgstr ""
 
-#: gui/options.cpp:687 gui/options.cpp:688
+#: gui/options.cpp:688 gui/options.cpp:689
 msgid "AdLib is used for music in many games"
 msgstr ""
 
-#: gui/options.cpp:698
+#: gui/options.cpp:699
 msgid "Output rate:"
 msgstr ""
 
-#: gui/options.cpp:698 gui/options.cpp:699
+#: gui/options.cpp:699 gui/options.cpp:700
 msgid ""
 "Higher value specifies better sound quality but may be not supported by your "
 "soundcard"
 msgstr ""
 
-#: gui/options.cpp:710
+#: gui/options.cpp:711
 msgid "SoundFont:"
 msgstr ""
 
-#: gui/options.cpp:710 gui/options.cpp:711
+#: gui/options.cpp:711 gui/options.cpp:712
 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
 msgstr ""
 
-#: gui/options.cpp:715
+#: gui/options.cpp:716
 msgid "Mixed AdLib/MIDI mode"
 msgstr ""
 
-#: gui/options.cpp:715
+#: gui/options.cpp:716
 msgid "Use both MIDI and AdLib sound generation"
 msgstr ""
 
-#: gui/options.cpp:718
+#: gui/options.cpp:719
 msgid "True Roland MT-32 (disable GM emulation)"
 msgstr ""
 
-#: gui/options.cpp:718
+#: gui/options.cpp:719
 msgid ""
 "Check if you want to use your real hardware Roland-compatible sound device "
 "connected to your computer"
 msgstr ""
 
-#: gui/options.cpp:721
+#: gui/options.cpp:722
 msgid "Enable Roland GS Mode"
 msgstr ""
 
-#: gui/options.cpp:721
+#: gui/options.cpp:722
 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
 msgstr ""
 
-#: gui/options.cpp:724
+#: gui/options.cpp:725
 msgid "MIDI gain:"
 msgstr ""
 
-#: gui/options.cpp:737
+#: gui/options.cpp:738
 msgid "Text and Speech:"
 msgstr ""
 
-#: gui/options.cpp:742 gui/options.cpp:748
+#: gui/options.cpp:743 gui/options.cpp:749
 msgid "Speech"
 msgstr ""
 
-#: gui/options.cpp:743 gui/options.cpp:749
+#: gui/options.cpp:744 gui/options.cpp:750
 msgid "Subtitles"
 msgstr ""
 
-#: gui/options.cpp:744 gui/options.cpp:750
+#: gui/options.cpp:745 gui/options.cpp:751
 msgid "Both"
 msgstr ""
 
-#: gui/options.cpp:748
+#: gui/options.cpp:749
 msgid "Spch"
 msgstr ""
 
-#: gui/options.cpp:749
+#: gui/options.cpp:750
 msgid "Subs"
 msgstr ""
 
-#: gui/options.cpp:750
+#: gui/options.cpp:751
 msgid "Show subtitles and play speech"
 msgstr ""
 
-#: gui/options.cpp:754
+#: gui/options.cpp:755
 msgid "Subtitle speed:"
 msgstr ""
 
-#: gui/options.cpp:766
+#: gui/options.cpp:767
 msgid "Music volume:"
 msgstr ""
 
-#: gui/options.cpp:773
+#: gui/options.cpp:774
 msgid "Mute All"
 msgstr ""
 
-#: gui/options.cpp:776
+#: gui/options.cpp:777
 msgid "SFX volume:"
 msgstr ""
 
-#: gui/options.cpp:776 gui/options.cpp:777
+#: gui/options.cpp:777 gui/options.cpp:778
 msgid "Special sound effects volume"
 msgstr ""
 
-#: gui/options.cpp:783
+#: gui/options.cpp:784
 msgid "Speech volume:"
 msgstr ""
 
-#: gui/options.cpp:914
+#: gui/options.cpp:915
 msgid "Save Path: "
 msgstr ""
 
-#: gui/options.cpp:917
+#: gui/options.cpp:918
 msgid "Theme Path:"
 msgstr ""
 
-#: gui/options.cpp:920 gui/options.cpp:921
+#: gui/options.cpp:921 gui/options.cpp:922
 msgid "Specifies path to additional data used by all games or ScummVM"
 msgstr ""
 
-#: gui/options.cpp:924
+#: gui/options.cpp:925
 msgid "Plugins Path:"
 msgstr ""
 
-#: gui/options.cpp:929
+#: gui/options.cpp:930
 msgid "Misc"
 msgstr ""
 
-#: gui/options.cpp:931
+#: gui/options.cpp:932
 msgid "Theme:"
 msgstr ""
 
-#: gui/options.cpp:935
+#: gui/options.cpp:936
 msgid "GUI Renderer:"
 msgstr ""
 
-#: gui/options.cpp:941
+#: gui/options.cpp:942
 msgid "Autosave:"
 msgstr ""
 
-#: gui/options.cpp:949
+#: gui/options.cpp:950
 msgid "Keys"
 msgstr ""
 
-#: gui/options.cpp:956
+#: gui/options.cpp:957
 msgid "GUI Language:"
 msgstr ""
 
-#: gui/options.cpp:956
+#: gui/options.cpp:957
 msgid "Language of ScummVM GUI"
 msgstr ""
 
-#: gui/options.cpp:961
+#: gui/options.cpp:962
 msgid "English"
 msgstr ""
 
-#: gui/options.cpp:1095
+#: gui/options.cpp:1106
 msgid "You have to restart ScummVM to take the effect."
 msgstr ""
 
-#: gui/options.cpp:1108
+#: gui/options.cpp:1119
 msgid "Select directory for savegames"
 msgstr ""
 
-#: gui/options.cpp:1115
+#: gui/options.cpp:1126
 msgid "The chosen directory cannot be written to. Please select another one."
 msgstr ""
 
-#: gui/options.cpp:1124
+#: gui/options.cpp:1135
 msgid "Select directory for GUI themes"
 msgstr ""
 
-#: gui/options.cpp:1134
+#: gui/options.cpp:1145
 msgid "Select directory for extra files"
 msgstr ""
 
-#: gui/options.cpp:1145
+#: gui/options.cpp:1156
 msgid "Select directory for plugins"
 msgstr ""
 
@@ -847,6 +847,14 @@ msgstr ""
 msgid "Unknown Error"
 msgstr ""
 
+#: common/util.cpp:254
+msgid "Hercules Green"
+msgstr ""
+
+#: common/util.cpp:255
+msgid "Hercules Amber"
+msgstr ""
+
 #: engines/dialogs.cpp:89
 msgid "~R~esume"
 msgstr ""
@@ -926,10 +934,22 @@ msgstr ""
 msgid "~W~ater Effect Enabled"
 msgstr ""
 
+#: sound/fmopl.cpp:51
+msgid "MAME OPL emulator"
+msgstr ""
+
+#: sound/fmopl.cpp:53
+msgid "DOSBox OPL emulator"
+msgstr ""
+
 #: sound/null.h:45
 msgid "No music"
 msgstr ""
 
+#: sound/softsynth/adlib.cpp:1590
+msgid "AdLib Emulator"
+msgstr ""
+
 #: sound/softsynth/mt32.cpp:327
 msgid "Initialising MT-32 Emulator"
 msgstr ""
@@ -938,8 +958,12 @@ msgstr ""
 msgid "MT-32 Emulator"
 msgstr ""
 
-#: sound/softsynth/adlib.cpp:1590
-msgid "AdLib Emulator"
+#: sound/softsynth/pcspk.cpp:142
+msgid "PC Speaker Emulator"
+msgstr ""
+
+#: sound/softsynth/pcspk.cpp:161
+msgid "IBM PCjr Emulator"
 msgstr ""
 
 #: sound/softsynth/ym2612.cpp:762
@@ -962,6 +986,10 @@ msgstr ""
 msgid " (Game)"
 msgstr ""
 
+#: backends/midi/windows.cpp:156
+msgid "Windows MIDI"
+msgstr ""
+
 #: backends/platform/ds/arm9/source/dsoptions.cpp:57
 msgid "ScummVM Main Menu"
 msgstr ""
@@ -1042,6 +1070,12 @@ msgstr ""
 msgid "Touchpad mode disabled."
 msgstr ""
 
+#: backends/platform/sdl/graphics.cpp:40
+#: backends/platform/wince/wince-sdl.cpp:111
+#: backends/platform/wince/wince-sdl.cpp:118
+msgid "Normal (no scaling)"
+msgstr ""
+
 #: backends/platform/symbian/src/SymbianActions.cpp:41
 #: backends/platform/wince/CEActionsSmartphone.cpp:38
 msgid "Up"
@@ -1122,10 +1156,6 @@ msgstr ""
 msgid "Do you want to quit ?"
 msgstr ""
 
-#: backends/platform/wii/options.cpp:47
-msgid "Ok"
-msgstr ""
-
 #: backends/platform/wii/options.cpp:51
 msgid "Video"
 msgstr ""