Skip to content

Commit

Permalink
I18N: Make MidiDriver detection errors translatable.
Browse files Browse the repository at this point in the history
  • Loading branch information
fuzzie committed Jun 6, 2011
1 parent 5da1427 commit 4af3045
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 3 deletions.
5 changes: 3 additions & 2 deletions audio/mididrv.cpp
Expand Up @@ -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"
Expand Down Expand Up @@ -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();
}
Expand Down Expand Up @@ -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();
}
Expand Down
1 change: 1 addition & 0 deletions po/POTFILES
Expand Up @@ -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
Expand Down
16 changes: 15 additions & 1 deletion po/scummvm.pot
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.4.0git\n"
"Report-Msgid-Bugs-To: scummvm-devel@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@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -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 ""
Expand Down

0 comments on commit 4af3045

Please sign in to comment.