[Scummvm-git-logs] scummvm master -> d0b27702438f7c7d99710383f2eb1247ae810edc

criezy criezy at scummvm.org
Thu Oct 13 02:16:17 CEST 2016


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:
d0b2770243 OPENGLSDL: Make some OSD messages translatable


Commit: d0b27702438f7c7d99710383f2eb1247ae810edc
    https://github.com/scummvm/scummvm/commit/d0b27702438f7c7d99710383f2eb1247ae810edc
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-10-13T01:15:38+01:00

Commit Message:
OPENGLSDL: Make some OSD messages translatable

Also change some OSD messages to be the same or similar to
messages used by the Surface SDL code.

Changed paths:
    backends/graphics/openglsdl/openglsdl-graphics.cpp
    po/POTFILES



diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index 33c82b9..f6ae25c 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -612,9 +612,9 @@ bool OpenGLSdlGraphicsManager::notifyEvent(const Common::Event &event) {
 
 #ifdef USE_OSD
 				if (getFeatureState(OSystem::kFeatureFullscreenMode)) {
-					displayMessageOnOSD("Fullscreen mode");
+					displayMessageOnOSD(_("Fullscreen mode"));
 				} else {
-					displayMessageOnOSD("Windowed mode");
+					displayMessageOnOSD(_("Windowed mode"));
 				}
 #endif
 				return true;
@@ -707,7 +707,7 @@ bool OpenGLSdlGraphicsManager::notifyEvent(const Common::Event &event) {
 #ifdef USE_OSD
 				int windowWidth = 0, windowHeight = 0;
 				getWindowDimensions(&windowWidth, &windowHeight);
-				const Common::String osdMsg = Common::String::format("Resolution: %dx%d", windowWidth, windowHeight);
+				const Common::String osdMsg = Common::String::format(_("Resolution: %dx%d"), windowWidth, windowHeight);
 				displayMessageOnOSD(osdMsg.c_str());
 #endif
 
@@ -727,9 +727,10 @@ bool OpenGLSdlGraphicsManager::notifyEvent(const Common::Event &event) {
 				assert(!_ignoreLoadVideoMode);
 
 #ifdef USE_OSD
-				Common::String osdMsg = "Aspect ratio correction: ";
-				osdMsg += getFeatureState(OSystem::kFeatureAspectRatioCorrection) ? "enabled" : "disabled";
-				displayMessageOnOSD(osdMsg.c_str());
+				if (getFeatureState(OSystem::kFeatureAspectRatioCorrection))
+					displayMessageOnOSD(_("Enabled aspect ratio correction"));
+				else
+					displayMessageOnOSD(_("Disabled aspect ratio correction"));
 #endif
 
 				return true;
@@ -773,7 +774,7 @@ bool OpenGLSdlGraphicsManager::notifyEvent(const Common::Event &event) {
 				assert(!_ignoreLoadVideoMode);
 
 #ifdef USE_OSD
-				const Common::String osdMsg = Common::String::format("Graphics mode: %s", _(modeDesc->description));
+				const Common::String osdMsg = Common::String::format(_("Graphics mode: %s"), _(modeDesc->description));
 				displayMessageOnOSD(osdMsg.c_str());
 #endif
 
diff --git a/po/POTFILES b/po/POTFILES
index 5d937ee..ac48660 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -57,6 +57,7 @@ backends/events/openpandora/op-events.cpp
 backends/events/symbiansdl/symbiansdl-events.cpp
 backends/events/webossdl/webossdl-events.cpp
 backends/graphics/opengl/opengl-graphics.cpp
+backends/graphics/openglsdl/openglsdl-graphics.cpp
 backends/graphics/surfacesdl/surfacesdl-graphics.cpp
 backends/graphics/wincesdl/wincesdl-graphics.cpp
 backends/keymapper/remap-dialog.cpp





More information about the Scummvm-git-logs mailing list