[Scummvm-git-logs] scummvm master -> 3aa7d85eabe15d991faff3d67bb601950c618cf9

sev- sev at scummvm.org
Sun Nov 27 13:22:35 CET 2016


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

Summary:
744b48cfd4 GNAP: Add POTFILES
2fa75b0728 KYRA: Update POTFILES
f72497665c MADS: Update POTFILES
4c589dc015 SCI: Update POTFILES
70a990f6ab SCUMM: Enable translation for the unknown game warning
74d2992177 TOON: Enable translation for some strings
b0fe56dae9 WAGE: Add POTFILES
89168bb000 ZVISION: Enable translation for some more strings
3aa7d85eab Merge pull request #862 from rootfather/enhance-translations


Commit: 744b48cfd4713778f4ff23b591cb65970e42bd13
    https://github.com/scummvm/scummvm/commit/744b48cfd4713778f4ff23b591cb65970e42bd13
Author: rootfather (rootfather at scummvm.org)
Date: 2016-11-26T11:14:01+01:00

Commit Message:
GNAP: Add POTFILES

Changed paths:
  A engines/gnap/POTFILES


diff --git a/engines/gnap/POTFILES b/engines/gnap/POTFILES
new file mode 100644
index 0000000..2369731
--- /dev/null
+++ b/engines/gnap/POTFILES
@@ -0,0 +1 @@
+engines/gnap/menu.cpp


Commit: 2fa75b07289a22b0c2f2bb31b5a8d499e58a47de
    https://github.com/scummvm/scummvm/commit/2fa75b07289a22b0c2f2bb31b5a8d499e58a47de
Author: rootfather (rootfather at scummvm.org)
Date: 2016-11-26T11:14:02+01:00

Commit Message:
KYRA: Update POTFILES

Changed paths:
    engines/kyra/POTFILES


diff --git a/engines/kyra/POTFILES b/engines/kyra/POTFILES
index e5b380e..c425b7a 100644
--- a/engines/kyra/POTFILES
+++ b/engines/kyra/POTFILES
@@ -1,4 +1,5 @@
 engines/kyra/detection.cpp
+engines/kyra/eobcommon.cpp
 engines/kyra/lol.cpp
 engines/kyra/sound_midi.cpp
 engines/kyra/saveload_eob.cpp


Commit: f72497665cc6f19539d3ea0fabe9afa6c9ab8cde
    https://github.com/scummvm/scummvm/commit/f72497665cc6f19539d3ea0fabe9afa6c9ab8cde
Author: rootfather (rootfather at scummvm.org)
Date: 2016-11-26T11:14:03+01:00

Commit Message:
MADS: Update POTFILES

Changed paths:
    engines/mads/POTFILES


diff --git a/engines/mads/POTFILES b/engines/mads/POTFILES
index 0364f94..7119cc9 100644
--- a/engines/mads/POTFILES
+++ b/engines/mads/POTFILES
@@ -1 +1,2 @@
 engines/mads/detection.cpp
+engines/mads/nebular/dialogs_nebular.cpp


Commit: 4c589dc0152bc36f84caa78400268151ff113813
    https://github.com/scummvm/scummvm/commit/4c589dc0152bc36f84caa78400268151ff113813
Author: rootfather (rootfather at scummvm.org)
Date: 2016-11-26T11:14:05+01:00

Commit Message:
SCI: Update POTFILES

Changed paths:
    engines/sci/POTFILES


diff --git a/engines/sci/POTFILES b/engines/sci/POTFILES
index f076c29..22af1e0 100644
--- a/engines/sci/POTFILES
+++ b/engines/sci/POTFILES
@@ -1,2 +1,3 @@
 engines/sci/detection.cpp
 engines/sci/engine/kfile.cpp
+engines/sci/graphics/controls32.cpp


Commit: 70a990f6ab8f972a9becc325b2665ae67eace8c3
    https://github.com/scummvm/scummvm/commit/70a990f6ab8f972a9becc325b2665ae67eace8c3
Author: rootfather (rootfather at scummvm.org)
Date: 2016-11-26T11:22:17+01:00

Commit Message:
SCUMM: Enable translation for the unknown game warning

We have translations enabled for the warning created
by advancedDetector.cpp, so I think it would be neat
to have translations enabled here too.

This also enables the message about the "Lite" version
of Putt-Putt Saves the Zoo being unsupported to the
translation database.

Changed paths:
    engines/scumm/detection.cpp


diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 6366ffd..88615e3 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -1117,10 +1117,10 @@ Common::Error ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) co
 	if (!findInMD5Table(res.md5.c_str())) {
 		Common::String md5Warning;
 
-		md5Warning = "Your game version appears to be unknown. If this is *NOT* a fan-modified\n";
-		md5Warning += "version (in particular, not a fan-made translation), please, report the\n";
-		md5Warning += "following data to the ScummVM team along with name of the game you tried\n";
-		md5Warning += "to add and its version/language/etc.:\n";
+		md5Warning = _("Your game version appears to be unknown. If this is *NOT* a fan-modified\n"
+		               "version (in particular, not a fan-made translation), please, report the\n"
+		               "following data to the ScummVM team along with name of the game you tried\n"
+		               "to add and its version/language/etc.:\n");
 
 		md5Warning += Common::String::format("  SCUMM gameid '%s', file '%s', MD5 '%s'\n\n",
 				res.game.gameid,
@@ -1135,8 +1135,8 @@ Common::Error ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) co
 	// We don't support the "Lite" version off puttzoo iOS because it contains
 	// the full game.
 	if (!strcmp(res.game.gameid, "puttzoo") && !strcmp(res.extra, "Lite")) {
-		GUIErrorMessage("The Lite version of Putt-Putt Saves the Zoo iOS is not supported to avoid piracy.\n"
-		                "The full version is available for purchase from the iTunes Store.");
+		GUIErrorMessage(_("The Lite version of Putt-Putt Saves the Zoo iOS is not supported to avoid piracy.\n"
+		                  "The full version is available for purchase from the iTunes Store."));
 		return Common::kUnsupportedGameidError;
 	}
 


Commit: 74d2992177751d9f8baa61369974deb7a970793f
    https://github.com/scummvm/scummvm/commit/74d2992177751d9f8baa61369974deb7a970793f
Author: rootfather (rootfather at scummvm.org)
Date: 2016-11-26T14:54:08+01:00

Commit Message:
TOON: Enable translation for some strings

Changed paths:
    engines/toon/toon.cpp


diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index 8373394..0dddc22 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -219,11 +219,11 @@ void ToonEngine::parseInput() {
 				if (slotNum >= 0 && slotNum <= 9 && canSaveGameStateCurrently()) {
 					if (saveGame(slotNum, "")) {
 						// ok
-						Common::String buf = Common::String::format("Saved game in slot #%d ", slotNum);
+						Common::String buf = Common::String::format(_("Saved game in slot #%d "), slotNum);
 						GUI::TimedMessageDialog dialog(buf, 1000);
 						dialog.runModal();
 					} else {
-						Common::String buf = Common::String::format("Could not quick save into slot #%d", slotNum);
+						Common::String buf = Common::String::format(_("Could not quick save into slot #%d"), slotNum);
 						GUI::MessageDialog dialog(buf, "OK", 0);
 						dialog.runModal();
 
@@ -236,11 +236,11 @@ void ToonEngine::parseInput() {
 				if (slotNum >= 0 && slotNum <= 9 && canLoadGameStateCurrently()) {
 					if (loadGame(slotNum)) {
 						// ok
-						Common::String buf = Common::String::format("Savegame #%d quick loaded", slotNum);
+						Common::String buf = Common::String::format(_("Savegame #%d quick loaded"), slotNum);
 						GUI::TimedMessageDialog dialog(buf, 1000);
 						dialog.runModal();
 					} else {
-						Common::String buf = Common::String::format("Could not quick load the savegame #%d", slotNum);
+						Common::String buf = Common::String::format(_("Could not quick load the savegame #%d"), slotNum);
 						GUI::MessageDialog dialog(buf, "OK", 0);
 						warning("%s", buf.c_str());
 						dialog.runModal();
@@ -4914,7 +4914,7 @@ bool ToonEngine::loadToonDat() {
 	in.open("toon.dat");
 
 	if (!in.isOpen()) {
-		msg = "You're missing the 'toon.dat' file. Get it from the ScummVM website";
+		msg = _("You're missing the 'toon.dat' file. Get it from the ScummVM website");
 		GUIErrorMessage(msg);
 		warning("%s", msg.c_str());
 		return false;
@@ -4926,7 +4926,7 @@ bool ToonEngine::loadToonDat() {
 	buf[4] = '\0';
 
 	if (strcmp(buf, "TOON")) {
-		msg = "File 'toon.dat' is corrupt. Get it from the ScummVM website";
+		msg = _("File 'toon.dat' is corrupt. Get it from the ScummVM website");
 		GUIErrorMessage(msg);
 		warning("%s", msg.c_str());
 		return false;
@@ -4936,7 +4936,7 @@ bool ToonEngine::loadToonDat() {
 	minVer = in.readByte();
 
 	if ((majVer != TOON_DAT_VER_MAJ) || (minVer != TOON_DAT_VER_MIN)) {
-		msg = Common::String::format("File 'toon.dat' is wrong version. Expected %d.%d but got %d.%d. Get it from the ScummVM website", TOON_DAT_VER_MAJ, TOON_DAT_VER_MIN, majVer, minVer);
+		msg = Common::String::format(_("File 'toon.dat' is wrong version. Expected %d.%d but got %d.%d. Get it from the ScummVM website"), TOON_DAT_VER_MAJ, TOON_DAT_VER_MIN, majVer, minVer);
 		GUIErrorMessage(msg);
 		warning("%s", msg.c_str());
 


Commit: b0fe56dae9969292ad2bc0ac554530a6419f2a3b
    https://github.com/scummvm/scummvm/commit/b0fe56dae9969292ad2bc0ac554530a6419f2a3b
Author: rootfather (rootfather at scummvm.org)
Date: 2016-11-26T16:13:00+01:00

Commit Message:
WAGE: Add POTFILES

Changed paths:
  A engines/wage/POTFILES


diff --git a/engines/wage/POTFILES b/engines/wage/POTFILES
new file mode 100644
index 0000000..7ab518c
--- /dev/null
+++ b/engines/wage/POTFILES
@@ -0,0 +1 @@
+engines/wage/saveload.cpp


Commit: 89168bb000b7fd15792743d3d3d8547aa2950ff9
    https://github.com/scummvm/scummvm/commit/89168bb000b7fd15792743d3d3d8547aa2950ff9
Author: rootfather (rootfather at scummvm.org)
Date: 2016-11-26T16:14:28+01:00

Commit Message:
ZVISION: Enable translation for some more strings

Changed paths:
    engines/zvision/POTFILES
    engines/zvision/file/save_manager.cpp


diff --git a/engines/zvision/POTFILES b/engines/zvision/POTFILES
index 61cf42d..ea349df 100644
--- a/engines/zvision/POTFILES
+++ b/engines/zvision/POTFILES
@@ -1 +1,2 @@
 engines/zvision/detection_tables.h
+engines/zvision/file/save_manager.cpp
diff --git a/engines/zvision/file/save_manager.cpp b/engines/zvision/file/save_manager.cpp
index d169679..89c595c 100644
--- a/engines/zvision/file/save_manager.cpp
+++ b/engines/zvision/file/save_manager.cpp
@@ -217,11 +217,11 @@ bool SaveManager::readSaveGameHeader(Common::InSaveFile *in, SaveGameHeader &hea
 		uint tempVersion = header.version;
 		GUI::MessageDialog dialog(
 			Common::String::format(
-				"This save file uses version %u, but this engine only "
-				"supports up to version %d. You will need an updated version "
-				"of the engine to use this save file.", tempVersion, SAVE_VERSION
+				_("This save file uses version %u, but this engine only "
+				  "supports up to version %d. You will need an updated version "
+				  "of the engine to use this save file."), tempVersion, SAVE_VERSION
 			),
-		"OK");
+		_("OK"));
 		dialog.runModal();
 	}
 


Commit: 3aa7d85eabe15d991faff3d67bb601950c618cf9
    https://github.com/scummvm/scummvm/commit/3aa7d85eabe15d991faff3d67bb601950c618cf9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-27T13:22:28+01:00

Commit Message:
Merge pull request #862 from rootfather/enhance-translations

I18N: Update/add POTFILES, enable some more strings for translation

Changed paths:
  A engines/gnap/POTFILES
  A engines/wage/POTFILES
    engines/kyra/POTFILES
    engines/mads/POTFILES
    engines/sci/POTFILES
    engines/scumm/detection.cpp
    engines/toon/toon.cpp
    engines/zvision/POTFILES
    engines/zvision/file/save_manager.cpp







More information about the Scummvm-git-logs mailing list