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

Tue Mar 10 22:39:01 UTC 2020

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

Summary:
6fa8c6df62 PRINCE: Do not crash on non-existent save
29a6d306b9 PRINCE: I18N: Added missing dialog option
9fd3ec193e PRINCE: I18N: Fix dialog order
b30b5d19cc PRINCE: Update translation.dat


Commit: 6fa8c6df62e0ef98277dec0d3cecef6816ae93a1
    https://github.com/scummvm/scummvm/commit/6fa8c6df62e0ef98277dec0d3cecef6816ae93a1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-10T22:19:21+01:00

Commit Message:
PRINCE: Do not crash on non-existent save

Changed paths:
    engines/prince/saveload.cpp

diff --git a/engines/prince/saveload.cpp b/engines/prince/saveload.cpp
index 9f4f0e9ed5..35711ab5b2 100644
--- a/engines/prince/saveload.cpp
+++ b/engines/prince/saveload.cpp
@@ -434,6 +434,9 @@ bool PrinceEngine::loadGame(int slotNumber) {
 	Common::String slotName = getSaveStateName(slotNumber);
 	Common::InSaveFile *saveFile = g_system->getSavefileManager()->openForLoading(slotName);
 
+	if (!saveFile)
+		return false;
+
 	// Read the data into a data buffer
 	int size = saveFile->size();
 	byte *dataBuffer = (byte *)malloc(size);


Commit: 29a6d306b99cdb647794cfae872cd33f183480ac
    https://github.com/scummvm/scummvm/commit/29a6d306b99cdb647794cfae872cd33f183480ac
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-10T22:20:40+01:00

Commit Message:
PRINCE: I18N: Added missing dialog option

Changed paths:
    devtools/create_prince/de.po
    devtools/create_prince/en.po
    devtools/create_prince/prince.pot
    devtools/create_prince/ru.po


diff --git a/devtools/create_prince/de.po b/devtools/create_prince/de.po
index 7c8c93aac2..6f79affc92 100644
--- a/devtools/create_prince/de.po
+++ b/devtools/create_prince/de.po
@@ -4711,6 +4711,10 @@ msgstr "#B1"
 msgid "#B1"
 msgstr "#B1"
 
+#: dialog0146.txt:100801
+msgid "#B1"
+msgstr "#B1"
+
 #: dialog0147.txt:1
 msgid "OTHER: To byÅ‚o przepiÄ™kne."
 msgstr "OTHER: Das war wunderschÃ¶n."
diff --git a/devtools/create_prince/en.po b/devtools/create_prince/en.po
index ea4040cf14..218ac17e01 100644
--- a/devtools/create_prince/en.po
+++ b/devtools/create_prince/en.po
@@ -5153,6 +5153,10 @@ msgstr "#B1"
 msgid "#B1"
 msgstr "#B1"
 
+#: dialog0146.txt:100801
+msgid "#B1"
+msgstr "#B1"
+
 #: dialog0147.txt:1
 msgid "OTHER: To byÅ‚o przepiÄ™kne."
 msgstr "OTHER: This was wonderful."
diff --git a/devtools/create_prince/prince.pot b/devtools/create_prince/prince.pot
index d80def6aec..5695490278 100644
--- a/devtools/create_prince/prince.pot
+++ b/devtools/create_prince/prince.pot
@@ -4710,6 +4710,10 @@ msgstr ""
 msgid "#B1"
 msgstr ""
 
+#: dialog0146.txt:100801
+msgid "#B1"
+msgstr ""
+
 #: dialog0147.txt:1
 msgid "OTHER: To byÅ‚o przepiÄ™kne."
 msgstr ""
diff --git a/devtools/create_prince/ru.po b/devtools/create_prince/ru.po
index 556ab7ad3b..22360764f8 100644
--- a/devtools/create_prince/ru.po
+++ b/devtools/create_prince/ru.po
@@ -4893,6 +4893,10 @@ msgstr "#B1"
 msgid "#B1"
 msgstr "#B1"
 
+#: dialog0146.txt:100801
+msgid "#B1"
+msgstr "#B1"
+
 #: dialog0147.txt:1
 msgid "OTHER: To byÅ‚o przepiÄ™kne."
 msgstr "OTHER: ÐÑ‚Ð¾ Ð±Ñ‹Ð»Ð¾ Ð¿Ñ€ÐµÐºÑ€Ð°ÑÐ½Ð¾."


Commit: 9fd3ec193e6a4a02cd75c174bfb73b64f26725cb
    https://github.com/scummvm/scummvm/commit/9fd3ec193e6a4a02cd75c174bfb73b64f26725cb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-10T23:36:35+01:00

Commit Message:
PRINCE: I18N: Fix dialog order

Changed paths:
    devtools/create_prince/de.po
    devtools/create_prince/en.po
    devtools/create_prince/prince.pot
    devtools/create_prince/ru.po


diff --git a/devtools/create_prince/de.po b/devtools/create_prince/de.po
index 6f79affc92..23b07ab9cb 100644
--- a/devtools/create_prince/de.po
+++ b/devtools/create_prince/de.po
@@ -4696,12 +4696,12 @@ msgid "#E3"
 msgstr "#E3"
 
 #: dialog0146.txt:100401
-msgid "#X1"
-msgstr "#X1"
+msgid "#E3"
+msgstr "#E3"
 
 #: dialog0146.txt:100501
-msgid "#B1"
-msgstr "#B1"
+msgid "#X1"
+msgstr "#X1"
 
 #: dialog0146.txt:100601
 msgid "#B1"
diff --git a/devtools/create_prince/en.po b/devtools/create_prince/en.po
index 218ac17e01..43253368ee 100644
--- a/devtools/create_prince/en.po
+++ b/devtools/create_prince/en.po
@@ -5138,12 +5138,12 @@ msgid "#E3"
 msgstr "#E3"
 
 #: dialog0146.txt:100401
-msgid "#X1"
-msgstr "#X1"
+msgid "#E3"
+msgstr "#E3"
 
 #: dialog0146.txt:100501
-msgid "#B1"
-msgstr "#B1"
+msgid "#X1"
+msgstr "#X1"
 
 #: dialog0146.txt:100601
 msgid "#B1"
diff --git a/devtools/create_prince/prince.pot b/devtools/create_prince/prince.pot
index 5695490278..f9870581f3 100644
--- a/devtools/create_prince/prince.pot
+++ b/devtools/create_prince/prince.pot
@@ -4695,11 +4695,11 @@ msgid "#E3"
 msgstr ""
 
 #: dialog0146.txt:100401
-msgid "#X1"
+msgid "#E3"
 msgstr ""
 
 #: dialog0146.txt:100501
-msgid "#B1"
+msgid "#X1"
 msgstr ""
 
 #: dialog0146.txt:100601
diff --git a/devtools/create_prince/ru.po b/devtools/create_prince/ru.po
index 22360764f8..f2ea2ce7d3 100644
--- a/devtools/create_prince/ru.po
+++ b/devtools/create_prince/ru.po
@@ -4878,12 +4878,12 @@ msgid "#E3"
 msgstr "#E3"
 
 #: dialog0146.txt:100401
-msgid "#X1"
-msgstr "#X1"
+msgid "#E3"
+msgstr "#E3"
 
 #: dialog0146.txt:100501
-msgid "#B1"
-msgstr "#B1"
+msgid "#X1"
+msgstr "#X1"
 
 #: dialog0146.txt:100601
 msgid "#B1"


Commit: b30b5d19cceb1e6cb4921fc05703de58250f78af
    https://github.com/scummvm/scummvm/commit/b30b5d19cceb1e6cb4921fc05703de58250f78af
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-10T23:38:39+01:00

Commit Message:
PRINCE: Update translation.dat

Changed paths:
    dists/engine-data/prince_translation.dat


diff --git a/dists/engine-data/prince_translation.dat b/dists/engine-data/prince_translation.dat
index b5dec38b69..b489703bc5 100644
Binary files a/dists/engine-data/prince_translation.dat and b/dists/engine-data/prince_translation.dat differ


