Merge remote branch 'upstream/master' into pegasus

1 files changed, 15 insertions, 8 deletions

diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index 3f9ffc9f3e..87457c3c08 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -28,6 +28,7 @@
 #include "backends/platform/sdl/sdl.h"
 #include "common/config-manager.h"
 #include "common/textconsole.h"
+#include "common/translation.h"
 
 OpenGLSdlGraphicsManager::OpenGLSdlGraphicsManager()
 	:
@@ -394,7 +395,8 @@ void OpenGLSdlGraphicsManager::displayModeChangedMsg() {
 		const int scaleFactor = getScale();
 
 		char buffer[128];
-		sprintf(buffer, "Current display mode: %s\n%d x %d -> %d x %d",
+		sprintf(buffer, "%s: %s\n%d x %d -> %d x %d",
+			_("Current display mode"),
 			newModeName,
 			_videoMode.screenWidth * scaleFactor,
 			_videoMode.screenHeight * scaleFactor,
@@ -406,7 +408,8 @@ void OpenGLSdlGraphicsManager::displayModeChangedMsg() {
 void OpenGLSdlGraphicsManager::displayScaleChangedMsg() {
 	char buffer[128];
 	const int scaleFactor = getScale();
-	sprintf(buffer, "Current scale: x%d\n%d x %d -> %d x %d",
+	sprintf(buffer, "%s: x%d\n%d x %d -> %d x %d",
+		_("Current scale"),
 		scaleFactor,
 		_videoMode.screenWidth, _videoMode.screenHeight,
 		_videoMode.overlayWidth, _videoMode.overlayHeight
@@ -449,11 +452,13 @@ void OpenGLSdlGraphicsManager::toggleFullScreen(int loop) {
 #ifdef USE_OSD
 	char buffer[128];
 	if (getFullscreenMode())
-		sprintf(buffer, "Fullscreen mode\n%d x %d",
+		sprintf(buffer, "%s\n%d x %d",
+			_("Fullscreen mode"),
 			_hwscreen->w, _hwscreen->h
 			);
 	else
-		sprintf(buffer, "Windowed mode\n%d x %d",
+		sprintf(buffer, "%s\n%d x %d",
+			_("Windowed mode"),
 			_hwscreen->w, _hwscreen->h
 			);
 	displayMessageOnOSD(buffer);
@@ -508,11 +513,13 @@ bool OpenGLSdlGraphicsManager::notifyEvent(const Common::Event &event) {
 #ifdef USE_OSD
 			char buffer[128];
 			if (getFeatureState(OSystem::kFeatureAspectRatioCorrection))
-				sprintf(buffer, "Enabled aspect ratio correction\n%d x %d -> %d x %d",
+				sprintf(buffer, "%s\n%d x %d -> %d x %d",
+						_("Enabled aspect ratio correction"),
 				        _videoMode.screenWidth, _videoMode.screenHeight,
 				        _hwscreen->w, _hwscreen->h);
 			else
-				sprintf(buffer, "Disabled aspect ratio correction\n%d x %d -> %d x %d",
+				sprintf(buffer, "%s\n%d x %d -> %d x %d",
+						_("Disabled aspect ratio correction"),
 				        _videoMode.screenWidth, _videoMode.screenHeight,
 				        _hwscreen->w, _hwscreen->h);
 			displayMessageOnOSD(buffer);
@@ -532,9 +539,9 @@ bool OpenGLSdlGraphicsManager::notifyEvent(const Common::Event &event) {
 				// modes we use, we might want to consider a better way of
 				// displaying information to the user.
 				if (getAntialiasingState())
-					displayMessageOnOSD("Active filter mode: Linear");
+					displayMessageOnOSD(_("Active filter mode: Linear"));
 				else
-					displayMessageOnOSD("Active filter mode: Nearest");
+					displayMessageOnOSD(_("Active filter mode: Nearest"));
 #endif
 				return true;
 			}