12 files changed, 177 insertions, 230 deletions

diff --git a/AUTHORS b/AUTHORS
index 4ce92a42e1..d85446a87d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -335,9 +335,6 @@ Other contributions
     Hungarian:
        Alex Bevilacqua
 
-    Italian:
-       Matteo Angelino
-
     Russian:
        Eugene Sandulenko
 
@@ -418,7 +415,7 @@ Other contributions
      Ravi I.               - SCI0 sound resource specification
      Ruediger Hanke        - Port to the MorphOS platform
      Rune Orsval           - Configuration file editor
-     Rickard Lind          - MT32->GM MIDI mapping magic, sound research
+     Rickard Lind          - MT-32->GM MIDI mapping magic, sound research
      Rink Springer         - Port to the DOS platform, several bug fixes
      Robey Pointer         - Bug tracking system hosting
      Sergey Lapin          - Port of Carl's type 2 decompression code
diff --git a/common/messages.cpp b/common/messages.cpp
index 82400ca995..fe87b5f642 100644
--- a/common/messages.cpp
+++ b/common/messages.cpp
@@ -128,8 +128,8 @@ static const char * const _messageIds[] = {
 	/* 124 */ "MAME OPL emulator",
 	/* 125 */ "MIDI",
 	/* 126 */ "MIDI gain:",
-	/* 127 */ "MT-32 Emulator",
-	/* 128 */ "MT32 Device:",
+	/* 127 */ "MT-32 Device:",
+	/* 128 */ "MT-32 Emulator",
 	/* 129 */ "Main screen scaling:",
 	/* 130 */ "Map",
 	/* 131 */ "Mass Add...",
@@ -324,7 +324,7 @@ struct PoMessageEntry {
 };
 
 static const PoMessageEntry _translation_ru_RU[] = {
-	{ 0, "Project-Id-Version: ScummVM VERSION\nReport-Msgid-Bugs-To: scummvm-devel@lists.sf.net\nPOT-Creation-Date: 2010-07-09 18:10+0100\nPO-Revision-Date: 2010-06-13 20:55+0300\nLast-Translator: Eugene Sandulenko <sev@scummvm.org>\nLanguage-Team: Russian\nMIME-Version: 1.0\nContent-Type: text/plain; charset=iso-8859-5\nContent-Transfer-Encoding: 8bit\nLanguage: \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@lists.sf.net\nPOT-Creation-Date: 2010-07-12 17:44+0200\nPO-Revision-Date: 2010-06-13 20:55+0300\nLast-Translator: Eugene Sandulenko <sev@scummvm.org>\nLanguage-Team: Russian\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=iso-8859-5\nContent-Transfer-Encoding: 8bit\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)" },
@@ -451,8 +451,8 @@ static const PoMessageEntry _translation_ru_RU[] = {
 	{ 124, "\315\334\343\333\357\342\336\340 MAME OPL:" },
 	{ 125, "MIDI" },
 	{ 126, "\303\341\330\333\325\335\330\325 MIDI:" },
-	{ 127, "\315\334\343\333\357\342\336\340 MT-32" },
-	{ 128, "\303\341\342\340\336\331\341\342\322\336 MT32:" },
+	{ 127, "\303\341\342\340\336\331\341\342\322\336 MT32:" },
+	{ 128, "\315\334\343\333\357\342\336\340 MT-32" },
 	{ 129, "\274\320\341\350\342\320\321 \323\333\320\322\335\336\323\336 \355\332\340\320\335\320:" },
 	{ 130, "\275\320\327\335\320\347\330\342\354" },
 	{ 131, "\264\336\321. \334\335\336\323\336..." },
@@ -642,7 +642,7 @@ static const PoMessageEntry _translation_ru_RU[] = {
 };
 
 static const PoMessageEntry _translation_fr_FR[] = {
-	{ 0, "Project-Id-Version: ScummVM 1.2.0svn\nReport-Msgid-Bugs-To: scummvm-devel@lists.sf.net\nPOT-Creation-Date: 2010-07-09 18:10+0100\nPO-Revision-Date: 2010-07-09 18:17+0100\nLast-Translator: Thierry Crozat <criezy@scummvm.org>\nLanguage-Team: French <scummvm-devel@lists.sf.net>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=iso-8859-1\nContent-Transfer-Encoding: 8bit\nLanguage: Francais\nPlural-Forms: nplurals=2; plural=n>1;\n" },
+	{ 0, "Project-Id-Version: ScummVM 1.2.0svn\nReport-Msgid-Bugs-To: scummvm-devel@lists.sf.net\nPOT-Creation-Date: 2010-07-12 17:44+0200\nPO-Revision-Date: 2010-07-09 18:17+0100\nLast-Translator: Thierry Crozat <criezy@scummvm.org>\nLanguage-Team: French <scummvm-devel@lists.sf.net>\nLanguage: Francais\nMIME-Version: 1.0\nContent-Type: text/plain; charset=iso-8859-1\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n>1;\n" },
 	{ 1, "Voulez-vous vraiment quitter?" },
 	{ 2, "(Actif)" },
 	{ 3, "(Jeu)" },
@@ -769,8 +769,8 @@ static const PoMessageEntry _translation_fr_FR[] = {
 	{ 124, "\311mulateur MAME OPL" },
 	{ 125, "MIDI" },
 	{ 126, "Gain MIDI:" },
-	{ 127, "\311mulateur MT-32" },
-	{ 128, "Sortie MT-32:" },
+	{ 127, "Sortie MT-32:" },
+	{ 128, "\311mulateur MT-32" },
 	{ 129, "\311chelle de l'\351cran principal" },
 	{ 130, "Affecter" },
 	{ 131, "Ajout Massif..." },
@@ -960,7 +960,7 @@ static const PoMessageEntry _translation_fr_FR[] = {
 };
 
 static const PoMessageEntry _translation_it_IT[] = {
-	{ 0, "Project-Id-Version: ScummVM 1.2.0svn\nReport-Msgid-Bugs-To: scummvm-devel@lists.sf.net\nPOT-Creation-Date: 2010-07-09 18:10+0100\nPO-Revision-Date: 2010-06-30 23:56+0100\nLast-Translator: Maff <matteo.maff at gmail dot com>\nLanguage-Team: Italian\nMIME-Version: 1.0\nContent-Type: text/plain; charset=iso-8859-1\nContent-Transfer-Encoding: 8bit\nLanguage: Italiano\n" },
+	{ 0, "Project-Id-Version: ScummVM 1.2.0svn\nReport-Msgid-Bugs-To: scummvm-devel@lists.sf.net\nPOT-Creation-Date: 2010-07-12 17:44+0200\nPO-Revision-Date: 2010-06-30 23:56+0100\nLast-Translator: Maff <matteo.maff at gmail dot com>\nLanguage-Team: Italian\nLanguage: Italiano\nMIME-Version: 1.0\nContent-Type: text/plain; charset=iso-8859-1\nContent-Transfer-Encoding: 8bit\n" },
 	{ 1, "   Sei sicuro di voler uscire?   " },
 	{ 2, " (Attivo)" },
 	{ 3, " (Gioco)" },
@@ -1087,8 +1087,8 @@ static const PoMessageEntry _translation_it_IT[] = {
 	{ 124, "Emulatore OPL MAME" },
 	{ 125, "MIDI" },
 	{ 126, "Guadagno MIDI:" },
-	{ 127, "Emulatore MT-32" },
-	{ 128, "Disposit. MT32:" },
+	{ 127, "Disposit. MT32:" },
+	{ 128, "Emulatore MT-32" },
 	{ 129, "Schermo principale:" },
 	{ 130, "Mappa" },
 	{ 131, "Agg. in massa..." },
@@ -1278,7 +1278,7 @@ static const PoMessageEntry _translation_it_IT[] = {
 };
 
 static const PoMessageEntry _translation_ca_ES[] = {
-	{ 0, "Project-Id-Version: ScummVM 1.2.0svn\nReport-Msgid-Bugs-To: scummvm-devel@lists.sf.net\nPOT-Creation-Date: 2010-07-09 18:10+0100\nPO-Revision-Date: 2010-06-26 16:45+0100\nLast-Translator: Jordi Vilalta Prat <jvprat@gmail.com>\nLanguage-Team: Catalan <scummvm-devel@lists.sf.net>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=iso-8859-1\nContent-Transfer-Encoding: 8bit\nLanguage: Catalan\n" },
+	{ 0, "Project-Id-Version: ScummVM 1.2.0svn\nReport-Msgid-Bugs-To: scummvm-devel@lists.sf.net\nPOT-Creation-Date: 2010-07-12 17:44+0200\nPO-Revision-Date: 2010-06-26 16:45+0100\nLast-Translator: Jordi Vilalta Prat <jvprat@gmail.com>\nLanguage-Team: Catalan <scummvm-devel@lists.sf.net>\nLanguage: Catalan\nMIME-Version: 1.0\nContent-Type: text/plain; charset=iso-8859-1\nContent-Transfer-Encoding: 8bit\n" },
 	{ 2, " (Actiu)" },
 	{ 3, " (Joc)" },
 	{ 4, " (Global)" },
@@ -1402,8 +1402,8 @@ static const PoMessageEntry _translation_ca_ES[] = {
 	{ 124, "Emulador OPL de MAME" },
 	{ 125, "MIDI" },
 	{ 126, "Guany MIDI:" },
-	{ 127, "Emulador de MT-32" },
-	{ 128, "Dispositiu MT32:" },
+	{ 127, "Dispositiu MT32:" },
+	{ 128, "Emulador de MT-32" },
 	{ 129, "Escalat de la pantalla principal:" },
 	{ 130, "Mapeja" },
 	{ 131, "Addici\363 Massiva..." },
@@ -1590,7 +1590,7 @@ static const PoMessageEntry _translation_ca_ES[] = {
 };
 
 static const PoMessageEntry _translation_hu_HU[] = {
-	{ 0, "Project-Id-Version: ScummVM VERSION\nReport-Msgid-Bugs-To: scummvm-devel@lists.sf.net\nPOT-Creation-Date: 2010-07-09 18:10+0100\nPO-Revision-Date: 2009-11-25 07:42-0500\nLast-Translator: Alex Bevilacqua <alexbevi@gmail.com>\nLanguage-Team: Hungarian\nMIME-Version: 1.0\nContent-Type: text/plain; charset=cp1250\nContent-Transfer-Encoding: 8bit\nLanguage: \nPlural-Forms: nplurals=2; plural=(n != 1);\n" },
+	{ 0, "Project-Id-Version: ScummVM VERSION\nReport-Msgid-Bugs-To: scummvm-devel@lists.sf.net\nPOT-Creation-Date: 2010-07-12 17:44+0200\nPO-Revision-Date: 2009-11-25 07:42-0500\nLast-Translator: Alex Bevilacqua <alexbevi@gmail.com>\nLanguage-Team: Hungarian\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=cp1250\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=(n != 1);\n" },
 	{ 14, "<alap\351rtelmezett>" },
 	{ 16, "AdLib vezet :" },
 	{ 17, "AdLib vezet :" },
@@ -1611,6 +1611,7 @@ static const PoMessageEntry _translation_hu_HU[] = {
 	{ 115, "Kulcsok" },
 	{ 124, "AdLib vezet :" },
 	{ 126, "MIDI nyeres\351g:" },
+	{ 127, "Zene mennyis\351g:" },
 	{ 134, "Vegyes AdLib/MIDI m\363d" },
 	{ 139, "Zene mennyis\351g:" },
 	{ 140, "Zene mennyis\351g:" },
@@ -1648,7 +1649,7 @@ static const PoMessageEntry _translation_hu_HU[] = {
 };
 
 static const PoMessageEntry _translation_de_DE[] = {
-	{ 0, "Project-Id-Version: ScummVM 1.2.0svn\nReport-Msgid-Bugs-To: scummvm-devel@lists.sf.net\nPOT-Creation-Date: 2010-07-09 18:10+0100\nPO-Revision-Date: 2010-07-09 20:37+0100\nLast-Translator: Simon Sawatzki\nLanguage-Team: Lothar Serra Mari <Lothar@Windowsbase.de> & Simon Sawatzki <SimSaw@gmx.de>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=iso-8859-1\nContent-Transfer-Encoding: 8bit\nLanguage: Deutsch\nPlural-Forms: nplurals=2; plural=n != 1;\n" },
+	{ 0, "Project-Id-Version: ScummVM 1.2.0svn\nReport-Msgid-Bugs-To: scummvm-devel@lists.sf.net\nPOT-Creation-Date: 2010-07-12 17:44+0200\nPO-Revision-Date: 2010-07-09 20:37+0100\nLast-Translator: Simon Sawatzki\nLanguage-Team: Lothar Serra Mari <Lothar@Windowsbase.de> & Simon Sawatzki <SimSaw@gmx.de>\nLanguage: Deutsch\nMIME-Version: 1.0\nContent-Type: text/plain; charset=iso-8859-1\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n != 1;\n" },
 	{ 1, "   M\366chten Sie wirklich beenden?    " },
 	{ 2, " (Aktiv)" },
 	{ 3, " (Spiel)" },
@@ -1775,8 +1776,8 @@ static const PoMessageEntry _translation_de_DE[] = {
 	{ 124, "MAME-OPL-Emulator" },
 	{ 125, "MIDI" },
 	{ 126, "MIDI-Lautst\344rke:" },
-	{ 127, "MT-32-Emulation" },
-	{ 128, "MT32-Ger\344t:" },
+	{ 127, "MT32-Ger\344t:" },
+	{ 128, "MT-32-Emulation" },
 	{ 129, "Hauptbildschirm-Skalierung:" },
 	{ 130, "Zuweisen" },
 	{ 131, "Durchsuchen" },
diff --git a/gui/credits.h b/gui/credits.h
index cf34150864..d8639da438 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -379,9 +379,6 @@ static const char *credits[] = {
 "C1""Hungarian",
 "C0""Alex Bevilacqua",
 "",
-"C1""Italian",
-"C0""Matteo Angelino",
-"",
 "C1""Russian",
 "C0""Eugene Sandulenko",
 "",
@@ -502,7 +499,7 @@ static const char *credits[] = {
 "C0""Rune Orsval",
 "C2""Configuration file editor",
 "C0""Rickard Lind",
-"C2""MT32->GM MIDI mapping magic, sound research",
+"C2""MT-32->GM MIDI mapping magic, sound research",
 "C0""Rink Springer",
 "C2""Port to the DOS platform, several bug fixes",
 "C0""Robey Pointer",
diff --git a/gui/options.cpp b/gui/options.cpp
index 1cdba06cd7..856eb668fa 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -645,7 +645,7 @@ void OptionsDialog::addAudioControls(GuiObject *boss, const Common::String &pref
 	_midiPopUpDesc = new StaticTextWidget(boss, prefix + "auMidiPopupDesc", _domain == Common::ConfigManager::kApplicationDomain ? _("Preferred Device:") : _("Music Device:"), _domain == Common::ConfigManager::kApplicationDomain ? _("Specifies preferred sound device or sound card emulator") : _("Specifies output sound device or sound card emulator"));
 	_midiPopUp = new PopUpWidget(boss, prefix + "auMidiPopup", _("Specifies output sound device or sound card emulator"));
 
-	_mt32DevicePopUpDesc = new StaticTextWidget(boss, prefix + "auPrefMt32PopupDesc", _("MT32 Device:"), _("Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"));
+	_mt32DevicePopUpDesc = new StaticTextWidget(boss, prefix + "auPrefMt32PopupDesc", _("MT-32 Device:"), _("Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"));
 	_mt32DevicePopUp = new PopUpWidget(boss, prefix + "auPrefMt32Popup");
 	_gmDevicePopUpDesc = new StaticTextWidget(boss, prefix + "auPrefGmPopupDesc", _("GM Device:"), _("Specifies default sound device for General MIDI output"));
 	_gmDevicePopUp = new PopUpWidget(boss, prefix + "auPrefGmPopup");
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 8c185ace96..7905fbdf16 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-07-09 18:10+0100\n"
+"POT-Creation-Date: 2010-07-12 17:44+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
@@ -498,7 +498,8 @@ msgid "Specifies output sound device or sound card emulator"
 msgstr "Especifica el dispositiu de so o l'emulador de tarja de so de sortida"
 
 #: gui/options.cpp:648
-msgid "MT32 Device:"
+#, fuzzy
+msgid "MT-32 Device:"
 msgstr "Dispositiu MT32:"
 
 #: gui/options.cpp:648
diff --git a/po/de_DE.po b/po/de_DE.po
index 1dac444868..4b3f493a03 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.2.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2010-07-09 18:10+0100\n"
+"POT-Creation-Date: 2010-07-12 17:44+0200\n"
 "PO-Revision-Date: 2010-07-09 20:37+0100\n"
 "Last-Translator: Simon Sawatzki\n"
 "Language-Team: Lothar Serra Mari <Lothar@Windowsbase.de> & Simon Sawatzki "
 "<SimSaw@gmx.de>\n"
+"Language: Deutsch\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: Deutsch\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: gui/about.cpp:96
@@ -500,7 +500,8 @@ msgid "Specifies output sound device or sound card emulator"
 msgstr "Legt das Musikwiedergabe-Gerät oder den Soundkarten-Emulator fest."
 
 #: gui/options.cpp:648
-msgid "MT32 Device:"
+#, fuzzy
+msgid "MT-32 Device:"
 msgstr "MT32-Gerät:"
 
 #: gui/options.cpp:648
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 3bc9878d00..d4e9e9f53c 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.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-07-09 18:10+0100\n"
+"POT-Creation-Date: 2010-07-12 17:44+0200\n"
 "PO-Revision-Date: 2010-07-09 18:17+0100\n"
 "Last-Translator: Thierry Crozat <criezy@scummvm.org>\n"
 "Language-Team: French <scummvm-devel@lists.sf.net>\n"
+"Language: Francais\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: Francais\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #: gui/about.cpp:96
@@ -38,27 +38,18 @@ msgstr "Remonter"
 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:972
-#: gui/saveload.cpp:65
-#: gui/saveload.cpp:157
-#: gui/themebrowser.cpp:56
+#: gui/browser.cpp:70 gui/chooser.cpp:49 gui/KeysDialog.cpp:46
+#: gui/launcher.cpp:266 gui/massadd.cpp:95 gui/options.cpp:972
+#: gui/saveload.cpp:65 gui/saveload.cpp:157 gui/themebrowser.cpp:56
 #: backends/platform/wii/options.cpp:48
 msgid "Cancel"
 msgstr "Annuler"
 
-#: gui/browser.cpp:71
-#: gui/chooser.cpp:50
-#: gui/themebrowser.cpp:57
+#: gui/browser.cpp:71 gui/chooser.cpp:50 gui/themebrowser.cpp:57
 msgid "Choose"
 msgstr "Choisir"
 
-#: gui/GuiManager.cpp:102
-#: backends/keymapper/remap-dialog.cpp:54
+#: gui/GuiManager.cpp:102 backends/keymapper/remap-dialog.cpp:54
 msgid "Close"
 msgstr "Fermer"
 
@@ -66,13 +57,11 @@ msgstr "Fermer"
 msgid "Mouse click"
 msgstr "Clic de souris"
 
-#: gui/GuiManager.cpp:108
-#: base/main.cpp:285
+#: gui/GuiManager.cpp:108 base/main.cpp:285
 msgid "Display keyboard"
 msgstr "Afficher le clavier"
 
-#: gui/GuiManager.cpp:111
-#: base/main.cpp:288
+#: gui/GuiManager.cpp:111 base/main.cpp:288
 msgid "Remap keys"
 msgstr "Changer l'affectation des touches"
 
@@ -80,12 +69,8 @@ msgstr "Changer l'affectation des touches"
 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:973
+#: gui/KeysDialog.cpp:45 gui/launcher.cpp:267 gui/launcher.cpp:873
+#: gui/launcher.cpp:877 gui/massadd.cpp:92 gui/options.cpp:973
 #: backends/platform/wii/options.cpp:47
 #: backends/platform/wince/CELauncherDialog.cpp:56
 msgid "OK"
@@ -95,16 +80,12 @@ msgstr "OK"
 msgid "Select an action and click 'Map'"
 msgstr "Selectionez une action et cliquez 'Affecter'"
 
-#: gui/KeysDialog.cpp:83
-#: gui/KeysDialog.cpp:105
-#: gui/KeysDialog.cpp:144
+#: gui/KeysDialog.cpp:83 gui/KeysDialog.cpp:105 gui/KeysDialog.cpp:144
 #, c-format
 msgid "Associated key : %s"
 msgstr "Touche associée: %s"
 
-#: gui/KeysDialog.cpp:85
-#: gui/KeysDialog.cpp:107
-#: gui/KeysDialog.cpp:146
+#: gui/KeysDialog.cpp:85 gui/KeysDialog.cpp:107 gui/KeysDialog.cpp:146
 #, c-format
 msgid "Associated key : none"
 msgstr "Touche associée: aucune"
@@ -129,17 +110,19 @@ msgstr "Jeu"
 msgid "ID:"
 msgstr "ID:"
 
-#: gui/launcher.cpp:173
-#: gui/launcher.cpp:174
-msgid "Short game identifier used for referring to savegames and running the game from the command line"
-msgstr "ID compact du jeu utilisé pour identifier les sauvegardes et démarrer le jeu depuis la ligne de commande"
+#: gui/launcher.cpp:173 gui/launcher.cpp:174
+msgid ""
+"Short game identifier used for referring to savegames and running the game "
+"from the command line"
+msgstr ""
+"ID compact du jeu utilisé pour identifier les sauvegardes et démarrer le jeu "
+"depuis la ligne de commande"
 
 #: gui/launcher.cpp:177
 msgid "Name:"
 msgstr "Nom:"
 
-#: gui/launcher.cpp:177
-#: gui/launcher.cpp:178
+#: gui/launcher.cpp:177 gui/launcher.cpp:178
 msgid "Full title of the game"
 msgstr "Nom complet du jeu"
 
@@ -147,17 +130,16 @@ msgstr "Nom complet du jeu"
 msgid "Language:"
 msgstr "Langue:"
 
-#: gui/launcher.cpp:181
-#: gui/launcher.cpp:182
-msgid "Language of the game. This will not turn your Spanish game version into English"
-msgstr "Langue du jeu. Cela ne traduira pas en anglais par magie votre version espagnole du jeu."
+#: gui/launcher.cpp:181 gui/launcher.cpp:182
+msgid ""
+"Language of the game. This will not turn your Spanish game version into "
+"English"
+msgstr ""
+"Langue du jeu. Cela ne traduira pas en anglais par magie votre version "
+"espagnole du jeu."
 
-#: gui/launcher.cpp:183
-#: gui/launcher.cpp:194
-#: gui/options.cpp:80
-#: gui/options.cpp:617
-#: gui/options.cpp:627
-#: gui/options.cpp:943
+#: gui/launcher.cpp:183 gui/launcher.cpp:194 gui/options.cpp:80
+#: gui/options.cpp:617 gui/options.cpp:627 gui/options.cpp:943
 #: sound/null.cpp:42
 msgid "<default>"
 msgstr "<defaut>"
@@ -166,20 +148,15 @@ msgstr "<defaut>"
 msgid "Platform:"
 msgstr "Plateforme:"
 
-#: gui/launcher.cpp:192
-#: gui/launcher.cpp:193
+#: gui/launcher.cpp:192 gui/launcher.cpp:193
 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:850
-#: gui/options.cpp:867
+#: gui/launcher.cpp:204 gui/options.cpp:850 gui/options.cpp:867
 msgid "Graphics"
 msgstr "Graphique"
 
-#: gui/launcher.cpp:204
-#: gui/options.cpp:850
-#: gui/options.cpp:867
+#: gui/launcher.cpp:204 gui/options.cpp:850 gui/options.cpp:867
 msgid "GFX"
 msgstr "GFX"
 
@@ -187,8 +164,7 @@ msgstr "GFX"
 msgid "Override global graphic settings"
 msgstr "Utiliser des réglages graphiques spécifiques à ce jeux"
 
-#: gui/launcher.cpp:213
-#: gui/options.cpp:873
+#: gui/launcher.cpp:213 gui/options.cpp:873
 msgid "Audio"
 msgstr "Audio"
 
@@ -196,8 +172,7 @@ msgstr "Audio"
 msgid "Override global audio settings"
 msgstr "Utiliser des réglages audio spécifiques à ce jeux"
 
-#: gui/launcher.cpp:223
-#: gui/options.cpp:877
+#: gui/launcher.cpp:223 gui/options.cpp:877
 msgid "Volume"
 msgstr "Volume"
 
@@ -205,8 +180,7 @@ msgstr "Volume"
 msgid "Override global volume settings"
 msgstr "Utiliser des réglages de volume sonore spécifiques à ce jeux"
 
-#: gui/launcher.cpp:232
-#: gui/options.cpp:885
+#: gui/launcher.cpp:232 gui/options.cpp:885
 msgid "MIDI"
 msgstr "MIDI"
 
@@ -214,8 +188,7 @@ msgstr "MIDI"
 msgid "Override global MIDI settings"
 msgstr "Utiliser des réglages MIDI spécifiques à ce jeux"
 
-#: gui/launcher.cpp:244
-#: gui/options.cpp:891
+#: gui/launcher.cpp:244 gui/options.cpp:891
 msgid "Paths"
 msgstr "Chemins"
 
@@ -223,13 +196,11 @@ msgstr "Chemins"
 msgid "Game Path:"
 msgstr "Chemin du Jeu:"
 
-#: gui/launcher.cpp:254
-#: gui/options.cpp:904
+#: gui/launcher.cpp:254 gui/options.cpp:904
 msgid "Extra Path:"
 msgstr "Extra:"
 
-#: gui/launcher.cpp:254
-#: gui/launcher.cpp:255
+#: gui/launcher.cpp:254 gui/launcher.cpp:255
 msgid "Specifies path to additional data used the game"
 msgstr "Définie un chemin vers des données suplémentaires utilisées par le jeu"
 
@@ -237,49 +208,31 @@ 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:898
+#: gui/launcher.cpp:258 gui/launcher.cpp:259 gui/options.cpp:898
 #: gui/options.cpp:899
 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:245
-#: gui/options.cpp:400
-#: gui/options.cpp:486
-#: gui/options.cpp:545
-#: gui/options.cpp:706
-#: gui/options.cpp:902
-#: gui/options.cpp:905
-#: gui/options.cpp:909
-#: gui/options.cpp:996
-#: gui/options.cpp:1002
-#: gui/options.cpp:1008
-#: gui/options.cpp:1016
-#: gui/options.cpp:1040
-#: gui/options.cpp:1044
-#: gui/options.cpp:1050
-#: gui/options.cpp:1057
-#: gui/options.cpp:1156
+#: gui/launcher.cpp:275 gui/launcher.cpp:353 gui/launcher.cpp:398
+#: gui/options.cpp:245 gui/options.cpp:400 gui/options.cpp:486
+#: gui/options.cpp:545 gui/options.cpp:706 gui/options.cpp:902
+#: gui/options.cpp:905 gui/options.cpp:909 gui/options.cpp:996
+#: gui/options.cpp:1002 gui/options.cpp:1008 gui/options.cpp:1016
+#: gui/options.cpp:1040 gui/options.cpp:1044 gui/options.cpp:1050
+#: gui/options.cpp:1057 gui/options.cpp:1156
 msgid "None"
 msgstr "Aucun"
 
-#: gui/launcher.cpp:280
-#: gui/launcher.cpp:357
+#: gui/launcher.cpp:280 gui/launcher.cpp:357
 #: backends/platform/wii/options.cpp:56
 msgid "Default"
 msgstr "Défaut"
 
-#: gui/launcher.cpp:391
-#: gui/options.cpp:1150
+#: gui/launcher.cpp:391 gui/options.cpp:1150
 msgid "Select SoundFont"
 msgstr "Choisir une banque de sons"
 
-#: gui/launcher.cpp:410
-#: gui/launcher.cpp:548
+#: gui/launcher.cpp:410 gui/launcher.cpp:548
 msgid "Select directory with game data"
 msgstr "Sélectionner le répertoire contenant les données du jeu"
 
@@ -295,8 +248,7 @@ msgstr "Sélectionner le répertoire pour les sauvegardes"
 msgid "This game ID is already taken. Please choose another one."
 msgstr "Cet ID est déjà utilisé par un autre jeu. Choisissez en un autre svp."
 
-#: gui/launcher.cpp:500
-#: engines/dialogs.cpp:113
+#: gui/launcher.cpp:500 engines/dialogs.cpp:113
 msgid "~Q~uit"
 msgstr "~Q~uitter"
 
@@ -342,7 +294,8 @@ msgstr "~A~jouter..."
 
 #: gui/launcher.cpp:511
 msgid "Hold Shift for Mass Add"
-msgstr "Ajoute un jeu à la Liste. Maintenez Shift enfoncée pour un Ajout Massif"
+msgstr ""
+"Ajoute un jeu à la Liste. Maintenez Shift enfoncée pour un Ajout Massif"
 
 #: gui/launcher.cpp:513
 msgid "~E~dit Game..."
@@ -364,34 +317,33 @@ msgstr "Supprime le jeu de la liste. Les fichiers sont conservés"
 msgid "Search in game list"
 msgstr "Recherche dans la liste de jeux"
 
-#: gui/launcher.cpp:526
-#: gui/launcher.cpp:1037
+#: gui/launcher.cpp:526 gui/launcher.cpp:1037
 msgid "Search:"
 msgstr "Filtre:"
 
-#: gui/launcher.cpp:529
-#: gui/options.cpp:707
+#: gui/launcher.cpp:529 gui/options.cpp:707
 msgid "Clear value"
 msgstr "Effacer la valeur"
 
-#: gui/launcher.cpp:551
-#: engines/dialogs.cpp:117
+#: gui/launcher.cpp:551 engines/dialogs.cpp:117
 msgid "Load game:"
 msgstr "Charger le jeu:"
 
-#: gui/launcher.cpp:551
-#: engines/dialogs.cpp:117
+#: gui/launcher.cpp:551 engines/dialogs.cpp:117
 #: backends/platform/wince/CEActionsPocket.cpp:263
 #: backends/platform/wince/CEActionsSmartphone.cpp:225
 msgid "Load"
 msgstr "Charger"
 
 #: gui/launcher.cpp:660
-msgid "Do you really want to run the mass game detector? This could potentially add a huge number of games."
-msgstr "Voulez-vous vraiment lancer la détection automatique des jeux? Cela peut potentiellement ajouter un grand nombre de jeux."
+msgid ""
+"Do you really want to run the mass game detector? This could potentially add "
+"a huge number of games."
+msgstr ""
+"Voulez-vous vraiment lancer la détection automatique des jeux? Cela peut "
+"potentiellement ajouter un grand nombre de jeux."
 
-#: gui/launcher.cpp:661
-#: gui/launcher.cpp:810
+#: gui/launcher.cpp:661 gui/launcher.cpp:810
 #: backends/platform/symbian/src/SymbianOS.cpp:446
 #: backends/platform/wince/CEActionsPocket.cpp:313
 #: backends/platform/wince/CEActionsSmartphone.cpp:272
@@ -399,8 +351,7 @@ msgstr "Voulez-vous vraiment lancer la détection automatique des jeux? Cela peut
 msgid "Yes"
 msgstr "Oui"
 
-#: gui/launcher.cpp:661
-#: gui/launcher.cpp:810
+#: gui/launcher.cpp:661 gui/launcher.cpp:810
 #: backends/platform/symbian/src/SymbianOS.cpp:446
 #: backends/platform/wince/CEActionsPocket.cpp:313
 #: backends/platform/wince/CEActionsSmartphone.cpp:272
@@ -426,7 +377,8 @@ msgstr "Voulez-vous vraiment supprimer ce jeu?"
 
 #: gui/launcher.cpp:873
 msgid "This game does not support loading games from the launcher."
-msgstr "Le chargement de sauvegarde depuis le lanceur n'est pas supporté pour ce jeu."
+msgstr ""
+"Le chargement de sauvegarde depuis le lanceur n'est pas supporté pour ce jeu."
 
 #: gui/launcher.cpp:877
 msgid "ScummVM could not find any engine capable of running the selected game!"
@@ -440,8 +392,7 @@ msgstr "Ajout Massif..."
 msgid "Add Game..."
 msgstr "Ajouter..."
 
-#: gui/massadd.cpp:79
-#: gui/massadd.cpp:82
+#: gui/massadd.cpp:79 gui/massadd.cpp:82
 msgid "... progress ..."
 msgstr "... en cours ..."
 
@@ -512,8 +463,7 @@ msgstr "Mode graphique:"
 msgid "Render mode:"
 msgstr "Mode de rendu:"
 
-#: gui/options.cpp:625
-#: gui/options.cpp:626
+#: gui/options.cpp:625 gui/options.cpp:626
 msgid "Special dithering modes supported by some games"
 msgstr "Mode spécial de tramage supporté par certains jeux"
 
@@ -539,20 +489,24 @@ msgstr "Sortie Audio:"
 
 #: gui/options.cpp:645
 msgid "Specifies preferred sound device or sound card emulator"
-msgstr "Spécifie le périphérique de sortie audio ou l'émulateur de carte audio préféré"
+msgstr ""
+"Spécifie le périphérique de sortie audio ou l'émulateur de carte audio "
+"préféré"
 
-#: gui/options.cpp:645
-#: gui/options.cpp:646
+#: gui/options.cpp:645 gui/options.cpp:646
 msgid "Specifies output sound device or sound card emulator"
 msgstr "Spécifie le périphérique de sortie audio ou l'émulateur de carte audio"
 
 #: gui/options.cpp:648
-msgid "MT32 Device:"
+#, fuzzy
+msgid "MT-32 Device:"
 msgstr "Sortie MT-32:"
 
 #: gui/options.cpp:648
 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
-msgstr "Spécifie le périphérique audio par défaut pour la sortie Roland MT-32/LAPC1/CM32l/CM64"
+msgstr ""
+"Spécifie le périphérique audio par défaut pour la sortie Roland MT-32/LAPC1/"
+"CM32l/CM64"
 
 #: gui/options.cpp:650
 msgid "GM Device:"
@@ -566,8 +520,7 @@ msgstr "Spécifie le périphérique audio par défaut pour la sortie General MIDI"
 msgid "AdLib emulator:"
 msgstr "Émulateur AdLib:"
 
-#: gui/options.cpp:682
-#: gui/options.cpp:683
+#: gui/options.cpp:682 gui/options.cpp:683
 msgid "AdLib is used for music in many games"
 msgstr "AdLib est utilisé pour la musique dans de nombreux jeux"
 
@@ -575,19 +528,23 @@ msgstr "AdLib est utilisé pour la musique dans de nombreux jeux"
 msgid "Output rate:"
 msgstr "Fréquence:"
 
-#: gui/options.cpp:693
-#: gui/options.cpp:694
-msgid "Higher value specifies better sound quality but may be not supported by your soundcard"
-msgstr "Une valeur plus élevée donne une meilleure qualité audio mais peut ne pas être supporté par votre carte son"
+#: gui/options.cpp:693 gui/options.cpp:694
+msgid ""
+"Higher value specifies better sound quality but may be not supported by your "
+"soundcard"
+msgstr ""
+"Une valeur plus élevée donne une meilleure qualité audio mais peut ne pas "
+"être supporté par votre carte son"
 
 #: gui/options.cpp:705
 msgid "SoundFont:"
 msgstr "Banque de sons:"
 
-#: gui/options.cpp:705
-#: gui/options.cpp:706
+#: gui/options.cpp:705 gui/options.cpp:706
 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"
+msgstr ""
+"La banque de sons est utilisée par certaines cartes audio, Fluidsynth et "
+"Timidity"
 
 #: gui/options.cpp:710
 msgid "Mixed AdLib/MIDI mode"
@@ -602,8 +559,12 @@ msgid "True Roland MT-32 (disable GM emulation)"
 msgstr "Roland MT-32 exacte (désactive l'émulation GM)"
 
 #: gui/options.cpp:713
-msgid "Check if you want to use your real hardware Roland-compatible sound device connected to your computer"
-msgstr "Vérifie si vous voulez utiliser un périphérique audio compatible Roland connecté à l'ordinateur"
+msgid ""
+"Check if you want to use your real hardware Roland-compatible sound device "
+"connected to your computer"
+msgstr ""
+"Vérifie si vous voulez utiliser un périphérique audio compatible Roland "
+"connecté à l'ordinateur"
 
 #: gui/options.cpp:716
 msgid "Enable Roland GS Mode"
@@ -621,18 +582,15 @@ msgstr "Gain MIDI:"
 msgid "Text and Speech:"
 msgstr "Dialogue:"
 
-#: gui/options.cpp:737
-#: gui/options.cpp:743
+#: gui/options.cpp:737 gui/options.cpp:743
 msgid "Speech"
 msgstr "Audio"
 
-#: gui/options.cpp:738
-#: gui/options.cpp:744
+#: gui/options.cpp:738 gui/options.cpp:744
 msgid "Subtitles"
 msgstr "Sous-titres"
 
-#: gui/options.cpp:739
-#: gui/options.cpp:745
+#: gui/options.cpp:739 gui/options.cpp:745
 msgid "Both"
 msgstr "Les deux"
 
@@ -664,8 +622,7 @@ msgstr "Silence"
 msgid "SFX volume:"
 msgstr "Volume Bruitage:"
 
-#: gui/options.cpp:771
-#: gui/options.cpp:772
+#: gui/options.cpp:771 gui/options.cpp:772
 msgid "Special sound effects volume"
 msgstr "Volume des effets spéciaux sonores"
 
@@ -681,10 +638,11 @@ msgstr "Sauvegardes:"
 msgid "Theme Path:"
 msgstr "Thèmes:"
 
-#: gui/options.cpp:904
-#: gui/options.cpp:905
+#: gui/options.cpp:904 gui/options.cpp:905
 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"
+msgstr ""
+"Spécifie un chemin vers des données supplémentaires utilisées par tous les "
+"jeux ou ScummVM"
 
 #: gui/options.cpp:908
 msgid "Plugins Path:"
@@ -724,7 +682,8 @@ msgstr "Anglais"
 
 #: gui/options.cpp:1089
 msgid "You have to restart ScummVM to take the effect."
-msgstr "Vous devez relancer ScummVM pour que le changement soit pris en compte."
+msgstr ""
+"Vous devez relancer ScummVM pour que le changement soit pris en compte."
 
 #: gui/options.cpp:1102
 msgid "Select directory for savegames"
@@ -732,7 +691,9 @@ msgstr "Sélectionner le répertoire pour les sauvegardes"
 
 #: gui/options.cpp:1109
 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."
+msgstr ""
+"Le répertoire sélectionné est vérouillé en écriture. Sélectionnez un autre "
+"répertoire."
 
 #: gui/options.cpp:1118
 msgid "Select directory for GUI themes"
@@ -746,23 +707,19 @@ msgstr "Sélectionner le répertoire pour les fichiers suplémentaires"
 msgid "Select directory for plugins"
 msgstr "Sélectionner le répertoire des plugins"
 
-#: gui/saveload.cpp:60
-#: gui/saveload.cpp:241
+#: gui/saveload.cpp:60 gui/saveload.cpp:241
 msgid "No date saved"
 msgstr "Date non sauvée"
 
-#: gui/saveload.cpp:61
-#: gui/saveload.cpp:242
+#: gui/saveload.cpp:61 gui/saveload.cpp:242
 msgid "No time saved"
 msgstr "Heure non sauvée"
 
-#: gui/saveload.cpp:62
-#: gui/saveload.cpp:243
+#: gui/saveload.cpp:62 gui/saveload.cpp:243
 msgid "No playtime saved"
 msgstr "Durée de jeu non sauvée"
 
-#: gui/saveload.cpp:69
-#: gui/saveload.cpp:157
+#: gui/saveload.cpp:69 gui/saveload.cpp:157
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -782,8 +739,7 @@ msgstr "Heure:"
 msgid "Playtime: "
 msgstr "Durée de jeu:"
 
-#: gui/saveload.cpp:286
-#: gui/saveload.cpp:353
+#: gui/saveload.cpp:286 gui/saveload.cpp:353
 msgid "Untitled savestate"
 msgstr "Sauvegarde sans nom"
 
@@ -812,15 +768,13 @@ msgstr "Le niveau de debug '%s' n'est pas supporté par ce moteur de jeu"
 msgid "Menu"
 msgstr "Menu"
 
-#: base/main.cpp:276
-#: backends/platform/symbian/src/SymbianActions.cpp:48
+#: base/main.cpp:276 backends/platform/symbian/src/SymbianActions.cpp:48
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:45
 msgid "Skip"
 msgstr "Passer"
 
-#: base/main.cpp:279
-#: backends/platform/symbian/src/SymbianActions.cpp:53
+#: base/main.cpp:279 backends/platform/symbian/src/SymbianActions.cpp:53
 #: backends/platform/wince/CEActionsPocket.cpp:41
 msgid "Pause"
 msgstr "Mettre en pause"
@@ -833,8 +787,7 @@ msgstr "Passer la phrase"
 msgid "Error running game:"
 msgstr "Erreur lors de l'éxécution du jeu:"
 
-#: base/main.cpp:430
-#: base/main.cpp:431
+#: base/main.cpp:430 base/main.cpp:431
 msgid "Could not find any engine capable of running the selected game"
 msgstr "Impossible de trouver un moteur pour exécuter le jeu sélectionné"
 
@@ -886,8 +839,7 @@ msgstr "Echec de la lecture"
 msgid "Writing data failed"
 msgstr "Echec de l'écriture des données"
 
-#: common/error.cpp:60
-#: common/error.cpp:71
+#: common/error.cpp:60 common/error.cpp:71
 msgid "Unknown Error"
 msgstr "Erreur inconnue"
 
@@ -931,8 +883,7 @@ msgstr "Retour au ~L~anceur"
 msgid "Save game:"
 msgstr "Sauvegarde:"
 
-#: engines/dialogs.cpp:119
-#: backends/platform/symbian/src/SymbianActions.cpp:47
+#: engines/dialogs.cpp:119 backends/platform/symbian/src/SymbianActions.cpp:47
 #: backends/platform/wince/CEActionsPocket.cpp:42
 #: backends/platform/wince/CEActionsPocket.cpp:263
 #: backends/platform/wince/CEActionsSmartphone.cpp:44
@@ -940,14 +891,12 @@ msgstr "Sauvegarde:"
 msgid "Save"
 msgstr "Sauver"
 
-#: engines/dialogs.cpp:301
-#: engines/mohawk/dialogs.cpp:84
+#: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:84
 #: engines/mohawk/dialogs.cpp:118
 msgid "~O~K"
 msgstr "~O~K"
 
-#: engines/dialogs.cpp:302
-#: engines/mohawk/dialogs.cpp:85
+#: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:85
 #: engines/mohawk/dialogs.cpp:119
 msgid "~C~ancel"
 msgstr "~A~nnuler"
@@ -969,8 +918,7 @@ msgstr "~S~uivant"
 msgid "~C~lose"
 msgstr "~F~ermer"
 
-#: engines/mohawk/dialogs.cpp:81
-#: engines/mohawk/dialogs.cpp:115
+#: engines/mohawk/dialogs.cpp:81 engines/mohawk/dialogs.cpp:115
 msgid "~Z~ip Mode Activated"
 msgstr "Mode ~Z~ip Activé"
 
@@ -1242,13 +1190,11 @@ msgstr "Acceleration du pad GC:"
 msgid "DVD"
 msgstr "DVD"
 
-#: backends/platform/wii/options.cpp:89
-#: backends/platform/wii/options.cpp:101
+#: backends/platform/wii/options.cpp:89 backends/platform/wii/options.cpp:101
 msgid "Status:"
 msgstr "Status:"
 
-#: backends/platform/wii/options.cpp:90
-#: backends/platform/wii/options.cpp:102
+#: backends/platform/wii/options.cpp:90 backends/platform/wii/options.cpp:102
 msgid "Unknown"
 msgstr "Inconue"
 
@@ -1458,8 +1404,8 @@ msgstr "Voulez-vous exécuter une recherche automatique?"
 
 #~ msgid "%s failed to instantiate engine: %s (target '%s', path '%s')"
 #~ msgstr ""
-#~ "Le plugin %s a échoué dans l'instanciation du moteur de jeu: %s (cible '%"
-#~ "s', chemin '%s')"
+#~ "Le plugin %s a échoué dans l'instanciation du moteur de jeu: %s (cible "
+#~ "'%s', chemin '%s')"
 
 #~ msgid "Ok"
 #~ msgstr "Ok"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 90cc469177..1d9a6c3268 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM VERSION\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2010-07-09 18:10+0100\n"
+"POT-Creation-Date: 2010-07-12 17:44+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
@@ -493,8 +493,9 @@ msgid "Specifies output sound device or sound card emulator"
 msgstr ""
 
 #: gui/options.cpp:648
-msgid "MT32 Device:"
-msgstr ""
+#, fuzzy
+msgid "MT-32 Device:"
+msgstr "Zene mennyiség:"
 
 #: gui/options.cpp:648
 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
diff --git a/po/it_IT.po b/po/it_IT.po
index a133d7009b..bbe6e92e95 100644
--- a/po/it_IT.po
+++ b/po/it_IT.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-07-09 18:10+0100\n"
+"POT-Creation-Date: 2010-07-12 17:44+0200\n"
 "PO-Revision-Date: 2010-06-30 23:56+0100\n"
 "Last-Translator: Maff <matteo.maff at gmail dot com>\n"
 "Language-Team: Italian\n"
+"Language: Italiano\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: Italiano\n"
 
 #: gui/about.cpp:96
 #, c-format
@@ -499,7 +499,8 @@ msgstr ""
 "Specifica il dispositivo di output audio o l'emulatore della scheda audio"
 
 #: gui/options.cpp:648
-msgid "MT32 Device:"
+#, fuzzy
+msgid "MT-32 Device:"
 msgstr "Disposit. MT32:"
 
 #: gui/options.cpp:648
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 46d5189e0b..2d4a96b63c 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM VERSION\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2010-07-09 18:10+0100\n"
+"POT-Creation-Date: 2010-07-12 17:44+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=iso-8859-5\n"
 "Content-Transfer-Encoding: 8bit\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"
+"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
 #, c-format
@@ -496,7 +496,8 @@ msgid "Specifies output sound device or sound card emulator"
 msgstr "ÃÚÐ×ëÒÐÕâ ÒëåÞÔÝÞÕ ×ÒãÚÞÒÞÕ ãáâàÞÙáâÒÞ ØÛØ íÜãÛïâÞà ×ÒãÚÞÒÞÙ ÚÐàâë"
 
 #: gui/options.cpp:648
-msgid "MT32 Device:"
+#, fuzzy
+msgid "MT-32 Device:"
 msgstr "ÃáâàÞÙáâÒÞ MT32:"
 
 #: gui/options.cpp:648
diff --git a/po/scummvm.pot b/po/scummvm.pot
index d150834f60..6fe4989982 100644
--- a/po/scummvm.pot
+++ b/po/scummvm.pot
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.2.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2010-07-09 18:10+0100\n"
+"POT-Creation-Date: 2010-07-12 17:44+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"
@@ -487,7 +488,7 @@ msgid "Specifies output sound device or sound card emulator"
 msgstr ""
 
 #: gui/options.cpp:648
-msgid "MT32 Device:"
+msgid "MT-32 Device:"
 msgstr ""
 
 #: gui/options.cpp:648
diff --git a/tools/credits.pl b/tools/credits.pl
index 6109969834..0a41d34b10 100755
--- a/tools/credits.pl
+++ b/tools/credits.pl
@@ -944,7 +944,7 @@ begin_credits("Credits");
 		add_person("Ravi I.", "", "SCI0 sound resource specification");
 		add_person("Ruediger Hanke", "", "Port to the MorphOS platform");
 		add_person("Rune Orsval", "", "Configuration file editor");
-		add_person("Rickard Lind", "", "MT32->GM MIDI mapping magic, sound research");
+		add_person("Rickard Lind", "", "MT-32->GM MIDI mapping magic, sound research");
 		add_person("Rink Springer", "", "Port to the DOS platform, several bug fixes");
 		add_person("Robey Pointer", "", "Bug tracking system hosting");
 		add_person("Sergey Lapin", "", "Port of Carl's type 2 decompression code");
@@ -955,8 +955,8 @@ begin_credits("Credits");
 		add_person("Sean Terrell", "", "");
 	  end_persons();
 	  add_paragraph("Special thanks to Prof. Dr. Gary Nutt ".
-					  "for allowing the FreeSCI VM extension as a ".
-					  "course project in his Advanced OS course.");
+	                "for allowing the FreeSCI VM extension as a ".
+	                "course project in his Advanced OS course.");
 	  add_paragraph("Special thanks to Bob Heitman and Corey Cole for their support of FreeSCI.");
 	end_section();