[Scummvm-cvs-logs] scummvm master -> 4af3045188b8bbd4fecd663233fa412cef179193

[fuzzie]

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

Summary:
4af3045188 I18N: Make MidiDriver detection errors translatable.


Commit: 4af3045188b8bbd4fecd663233fa412cef179193
    https://github.com/scummvm/scummvm/commit/4af3045188b8bbd4fecd663233fa412cef179193
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-06-06T03:44:28-07:00

Commit Message:
I18N: Make MidiDriver detection errors translatable.

Changed paths:
    audio/mididrv.cpp
    po/POTFILES
    po/scummvm.pot



diff --git a/audio/mididrv.cpp b/audio/mididrv.cpp
index 69214fd..2cccfcc 100644
--- a/audio/mididrv.cpp
+++ b/audio/mididrv.cpp
@@ -25,6 +25,7 @@
 #include "common/str.h"
 #include "common/system.h"
 #include "common/textconsole.h"
+#include "common/translation.h"
 #include "common/util.h"
 #include "gui/message.h"
 #include "audio/mididrv.h"
@@ -202,7 +203,7 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) {
 		} else {
 			// If the expressly selected device is unavailable we display a warning and continue.
 			failedDevStr = getDeviceString(hdl, MidiDriver::kDeviceName);
-			Common::String warningMsg = "Failed to detect the selected audio device '" + failedDevStr +"'. See log file for more information. Attempting to fall back to the next available device...";
+			Common::String warningMsg = Common::String::format(_("Failed to detect the selected audio device '%s'. See log file for more information. Attempting to fall back to the next available device..."), failedDevStr.c_str());
 			GUI::MessageDialog dialog(warningMsg);
 			dialog.runModal();
 		}
@@ -242,7 +243,7 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) {
 						// Don't warn about the missing device if we did already (this becomes relevant if the failing
 						// device is selected as preferred device and also as GM or MT-32 device).
 						if (failedDevStr != getDeviceString(hdl, MidiDriver::kDeviceName)) {							
-							Common::String warningMsg = "Failed to detect the preferred device '" + getDeviceString(hdl, MidiDriver::kDeviceName) + "'. See log file for more information. Attempting to fall back to the next available device...";
+							Common::String warningMsg = Common::String::format(_("Failed to detect the preferred device '%s'. See log file for more information. Attempting to fall back to the next available device..."), getDeviceString(hdl, MidiDriver::kDeviceName).c_str());
 							GUI::MessageDialog dialog(warningMsg);
 							dialog.runModal();
 						}
diff --git a/po/POTFILES b/po/POTFILES
index fc14daf..581099f 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -32,6 +32,7 @@ engines/sci/engine/kfile.cpp
 engines/agos/saveload.cpp
 
 audio/fmopl.cpp
+audio/mididrv.cpp
 audio/musicplugin.cpp
 audio/null.h
 audio/null.cpp
diff --git a/po/scummvm.pot b/po/scummvm.pot
index ff41b69..1e3e50a 100644
--- a/po/scummvm.pot
+++ b/po/scummvm.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.4.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2011-06-06 12:30+0200\n"
+"POT-Creation-Date: 2011-06-06 12:43+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -1762,6 +1762,20 @@ msgstr ""
 msgid "DOSBox OPL emulator"
 msgstr ""
 
+#: audio/mididrv.cpp:206
+#, c-format
+msgid ""
+"Failed to detect the selected audio device '%s'. See log file for more "
+"information. Attempting to fall back to the next available device..."
+msgstr ""
+
+#: audio/mididrv.cpp:246
+#, c-format
+msgid ""
+"Failed to detect the preferred device '%s'. See log file for more "
+"information. Attempting to fall back to the next available device..."
+msgstr ""
+
 #: audio/null.h:43
 msgid "No music"
 msgstr ""