aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backends/midi/windows.cpp3
-rw-r--r--backends/platform/sdl/graphics.cpp5
-rw-r--r--backends/platform/wii/options.cpp2
-rw-r--r--backends/platform/wince/wince-sdl.cpp5
-rw-r--r--common/util.cpp7
-rw-r--r--gui/about.cpp19
-rw-r--r--gui/options.cpp2
-rw-r--r--sound/fmopl.cpp4
-rw-r--r--sound/null.cpp4
-rw-r--r--sound/softsynth/pcspk.cpp4
10 files changed, 31 insertions, 24 deletions
diff --git a/backends/midi/windows.cpp b/backends/midi/windows.cpp
index d030d9827d..08587a6b80 100644
--- a/backends/midi/windows.cpp
+++ b/backends/midi/windows.cpp
@@ -31,6 +31,7 @@
#include "sound/musicplugin.h"
#include "sound/mpu401.h"
#include "common/config-manager.h"
+#include "common/translation.h"
#include <mmsystem.h>
@@ -152,7 +153,7 @@ void MidiDriver_WIN::check_error(MMRESULT result) {
class WindowsMusicPlugin : public MusicPluginObject {
public:
const char *getName() const {
- return "Windows MIDI";
+ return _s("Windows MIDI");
}
const char *getId() const {
diff --git a/backends/platform/sdl/graphics.cpp b/backends/platform/sdl/graphics.cpp
index 721cc54c90..05870015cb 100644
--- a/backends/platform/sdl/graphics.cpp
+++ b/backends/platform/sdl/graphics.cpp
@@ -25,6 +25,7 @@
#include "backends/platform/sdl/sdl.h"
#include "common/mutex.h"
+#include "common/translation.h"
#include "common/util.h"
#ifdef USE_RGB_COLOR
#include "common/list.h"
@@ -36,7 +37,7 @@
#include "graphics/surface.h"
static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
- {"1x", "Normal (no scaling)", GFX_NORMAL},
+ {"1x", _s("Normal (no scaling)"), GFX_NORMAL},
#ifdef USE_SCALERS
{"2x", "2x", GFX_DOUBLESIZE},
{"3x", "3x", GFX_TRIPLESIZE},
@@ -1378,7 +1379,7 @@ void OSystem_SDL::warpMouse(int x, int y) {
int y1 = y;
// Don't change mouse position, when mouse is outside of our window (in case of windowed mode)
- if (!(SDL_GetAppState( ) & SDL_APPMOUSEFOCUS))
+ if (!(SDL_GetAppState( ) & SDL_APPMOUSEFOCUS))
return;
if (_videoMode.aspectRatioCorrection && !_overlayVisible)
diff --git a/backends/platform/wii/options.cpp b/backends/platform/wii/options.cpp
index 402782a58d..295856d564 100644
--- a/backends/platform/wii/options.cpp
+++ b/backends/platform/wii/options.cpp
@@ -44,7 +44,7 @@ WiiOptionsDialog::WiiOptionsDialog(bool doubleStrike) :
_strUnderscanY = "wii_video_default_underscan_y";
}
- new ButtonWidget(this, _w - 108 - 16, _h - 24 - 16, 108, 24, _("Ok"), 0, 'k');
+ new ButtonWidget(this, _w - 108 - 16, _h - 24 - 16, 108, 24, _("OK"), 0, 'k');
new ButtonWidget(this, _w - 216 - 32, _h - 24 - 16, 108, 24, _("Cancel"), 0, 'c');
_tab = new TabWidget(this, 0, 0, _w, _h - 54);
diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp
index 970c9dce90..aef2117bd7 100644
--- a/backends/platform/wince/wince-sdl.cpp
+++ b/backends/platform/wince/wince-sdl.cpp
@@ -30,6 +30,7 @@
#include "common/events.h"
#include "common/util.h"
#include "common/timer.h"
+#include "common/translation.h"
#include "engines/engine.h"
@@ -107,14 +108,14 @@ bool _hasSmartphoneResolution = false;
// Low end devices 240x320
static const OSystem::GraphicsMode s_supportedGraphicsModesLow[] = {
- {"1x", "Normal (no scaling)", GFX_NORMAL},
+ {"1x", _s("Normal (no scaling)"), GFX_NORMAL},
{0, 0, 0}
};
// High end device 480x640
static const OSystem::GraphicsMode s_supportedGraphicsModesHigh[] = {
- {"1x", "Normal (no scaling)", GFX_NORMAL},
+ {"1x", _s("Normal (no scaling)"), GFX_NORMAL},
{"2x", "2x", GFX_DOUBLESIZE},
#ifndef _MSC_VER // EVC breaks template functions, and I'm tired of fixing them :)
{"2xsai", "2xSAI", GFX_2XSAI},
diff --git a/common/util.cpp b/common/util.cpp
index b6f7bcd58f..53630fc6f3 100644
--- a/common/util.cpp
+++ b/common/util.cpp
@@ -24,6 +24,7 @@
#include "common/util.h"
#include "common/system.h"
+#include "common/translation.h"
#include "common/config-manager.h"
namespace Common {
@@ -31,7 +32,7 @@ namespace Common {
//
// Print hexdump of the data passed in
//
-void hexdump(const byte * data, int len, int bytesPerLine, int startOffset) {
+void hexdump(const byte *data, int len, int bytesPerLine, int startOffset) {
assert(1 <= bytesPerLine && bytesPerLine <= 32);
int i;
byte c;
@@ -250,8 +251,8 @@ const char *getPlatformDescription(Platform id) {
const RenderModeDescription g_renderModes[] = {
- {"hercGreen", "Hercules Green", kRenderHercG},
- {"hercAmber", "Hercules Amber", kRenderHercA},
+ {"hercGreen", _s("Hercules Green"), kRenderHercG},
+ {"hercAmber", _s("Hercules Amber"), kRenderHercA},
{"cga", "CGA", kRenderCGA},
{"ega", "EGA", kRenderEGA},
{"amiga", "Amiga", kRenderAmiga},
diff --git a/gui/about.cpp b/gui/about.cpp
index a999674751..3caab084ca 100644
--- a/gui/about.cpp
+++ b/gui/about.cpp
@@ -93,22 +93,25 @@ AboutDialog::AboutDialog()
version += gScummVMVersion;
_lines.push_back(version);
- Common::String date(_s("C2""(built on "));
- date += gScummVMBuildDate;
- date += ')';
- _lines.push_back(date);
+ Common::String date = Common::String::printf(_("(built on %s)"), gScummVMBuildDate);
+ _lines.push_back("C2" + date);
for (i = 0; i < ARRAYSIZE(copyright_text); i++)
addLine(copyright_text[i]);
- addLine(_s("C1""Features compiled in:"));
- Common::String features("C0");
- features += gScummVMFeatures;
+ Common::String features("C1");
+ features += _("Features compiled in:");
addLine(features.c_str());
+ Common::String featureList("C0");
+ featureList += gScummVMFeatures;
+ addLine(featureList.c_str());
_lines.push_back("");
- addLine(_s("C1""Available engines:"));
+ Common::String engines("C1");
+ engines += _("Available engines:");
+ addLine(engines.c_str());
+
const EnginePlugin::List &plugins = EngineMan.getPlugins();
EnginePlugin::List::const_iterator iter = plugins.begin();
for (; iter != plugins.end(); ++iter) {
diff --git a/gui/options.cpp b/gui/options.cpp
index a22ceacf2d..9857d8b8d6 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -653,7 +653,7 @@ void OptionsDialog::addAudioControls(GuiObject *boss, const Common::String &pref
_mt32DevicePopUpDesc = new StaticTextWidget(boss, prefix + "auPrefMt32PopupDesc", _("MT32 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"));
+ _gmDevicePopUpDesc = new StaticTextWidget(boss, prefix + "auPrefGmPopupDesc", _("GM Device:"), _("Specifies default sound device for General MIDI output"));
_gmDevicePopUp = new PopUpWidget(boss, prefix + "auPrefGmPopup");
// Populate it
diff --git a/sound/fmopl.cpp b/sound/fmopl.cpp
index 8fdddc20f8..dea8c5429b 100644
--- a/sound/fmopl.cpp
+++ b/sound/fmopl.cpp
@@ -47,9 +47,9 @@ OPL::OPL() {
const Config::EmulatorDescription Config::_drivers[] = {
{ "auto", "<default>", kAuto, kFlagOpl2 | kFlagDualOpl2 | kFlagOpl3 },
- { "mame", "MAME OPL emulator", kMame, kFlagOpl2 },
+ { "mame", _s("MAME OPL emulator"), kMame, kFlagOpl2 },
#ifndef DISABLE_DOSBOX_OPL
- { "db", "DOSBox OPL emulator", kDOSBox, kFlagOpl2 | kFlagDualOpl2 | kFlagOpl3 },
+ { "db", _s("DOSBox OPL emulator"), kDOSBox, kFlagOpl2 | kFlagDualOpl2 | kFlagOpl3 },
#endif
{ 0, 0, 0, 0 }
};
diff --git a/sound/null.cpp b/sound/null.cpp
index 9be545ab76..556b96c14c 100644
--- a/sound/null.cpp
+++ b/sound/null.cpp
@@ -32,7 +32,7 @@ Common::Error NullMusicPlugin::createInstance(MidiDriver **mididriver, MidiDrive
MusicDevices NullMusicPlugin::getDevices() const {
MusicDevices devices;
- devices.push_back(MusicDevice(this, _s(""), MT_NULL));
+ devices.push_back(MusicDevice(this, "", MT_NULL));
return devices;
}
@@ -50,7 +50,7 @@ public:
MusicDevices AutoMusicPlugin::getDevices() const {
MusicDevices devices;
- devices.push_back(MusicDevice(this, _s(""), MT_AUTO));
+ devices.push_back(MusicDevice(this, "", MT_AUTO));
return devices;
}
diff --git a/sound/softsynth/pcspk.cpp b/sound/softsynth/pcspk.cpp
index fae2b7eef3..bdf9f112e8 100644
--- a/sound/softsynth/pcspk.cpp
+++ b/sound/softsynth/pcspk.cpp
@@ -151,7 +151,7 @@ public:
MusicDevices PCSpeakerMusicPlugin::getDevices() const {
MusicDevices devices;
- devices.push_back(MusicDevice(this, _s(""), MT_PCSPK));
+ devices.push_back(MusicDevice(this, "", MT_PCSPK));
return devices;
}
@@ -170,7 +170,7 @@ public:
MusicDevices PCjrMusicPlugin::getDevices() const {
MusicDevices devices;
- devices.push_back(MusicDevice(this, _s(""), MT_PCJR));
+ devices.push_back(MusicDevice(this, "", MT_PCJR));
return devices;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-15 02:49:53 +0000