[Scummvm-git-logs] scummvm master -> fdb2c1950e5ea62671391cd5d6a84a507e0cfd72
sev-
noreply at scummvm.org
Fri Mar 17 15:25:23 UTC 2023
This automated email contains information about 36 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
6a708154d8 MOHAWK: Remove duplicate file from POTFILES
96c7632235 I18N: Remove obsolete comment
511a77f643 AUDIO: Avoid including translations.h in header file
1f49e54599 ANDROID: Avoid including translations.h in a header
30623a0ecf I18N: Add missing Atari POTFILES
d8cde5a2ec GRAPHICS: Remove redundant include
93f52769f6 VCRUISE: Remove unused include
d5409236c3 ULTIMA: ULTIMA8: Fix I18N includes
b1295a7f1d TRECISION: Remove unused translation.h include
4afbfdf78d TETRAEDGE: Fix I18N includes and add POTFILES
c7c1269c65 STARK: Remove unneded translation.h include
3776ffa8ed SHERLOCK: Fix translation.h include usage
87da2b8aae ZVISION: Fix I18N include usage
370794b774 BACKENDS: Added missing POTFILES and added I18N-related comments
bb2bd83257 HADESCH: Remove leftover includes for translation.h
51ae8a7381 I18N: Added some files to POTFILES
8c4ee259cb AGI: Fix I18N includes
c32d884b74 BBVS: Added POTFILES. The file is not translatable but makes automated checks simpler
709a593e5c DIRECTOR: Added missing POTFILES
1516aee14a SCI: Fix POTFILES
f378ec4242 MTROPOLIS: Fix POTFILES
2316887609 HPL1: Remove unused translation.h includes
d66a77a9b7 SCUMM: Made pre-release checker happier in relation to I18N
67c01ef9bd NEVERHOOD: Fix POTFILES
02a28ad7aa MOHAWK: Fix I18N usage
8381a9d4d6 MM: MM1: Properly mark keybindings for translation and add to POTFILES
3607d9c990 BLADERUNNER: Remove unnecessary translation.h include
d327079f24 BURIED: Fix POTFILES
5b908cafcb GLK: Removed unnecessary translations.h include
a3cac76eb4 GROOVIE: Fixes to I18N lists and includes
1373c48d35 HPL1: Add missing POTFILES
edbb112a56 ICB: Add missing POTFILES
c5d49620b3 ICB: Added I18N comments to keybindings
555974a584 KYRA: Fix POTFILES
7c6e369ba3 MADE: Fix POTFILES
fdb2c1950e DEVTOOLS: Added checks for POTFILES usage
Commit: 6a708154d8385ca485b7c2b6a175ef31d71f08a7
https://github.com/scummvm/scummvm/commit/6a708154d8385ca485b7c2b6a175ef31d71f08a7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T13:50:32+01:00
Commit Message:
MOHAWK: Remove duplicate file from POTFILES
Changed paths:
engines/mohawk/POTFILES
diff --git a/engines/mohawk/POTFILES b/engines/mohawk/POTFILES
index 492b2e0ce1b..d13e542a30f 100644
--- a/engines/mohawk/POTFILES
+++ b/engines/mohawk/POTFILES
@@ -3,7 +3,6 @@ engines/mohawk/detection.cpp
engines/mohawk/dialogs.cpp
engines/mohawk/metaengine.cpp
engines/mohawk/mohawk.cpp
-engines/mohawk/metaengine.cpp
engines/mohawk/myst.cpp
engines/mohawk/myst_stacks/menu.cpp
engines/mohawk/myst_stacks/preview.cpp
Commit: 96c76322350e13b10a2f5d86d34eb4dd0a682109
https://github.com/scummvm/scummvm/commit/96c76322350e13b10a2f5d86d34eb4dd0a682109
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T13:57:22+01:00
Commit Message:
I18N: Remove obsolete comment
Changed paths:
po/POTFILES
diff --git a/po/POTFILES b/po/POTFILES
index e6deb0d17f5..40f1d664660 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -1,5 +1,3 @@
-#TODO: help_string & usage_string:
-
gui/about.cpp
gui/browser.cpp
gui/chooser.cpp
Commit: 511a77f6430669f21d358c53c98099562b7ffc03
https://github.com/scummvm/scummvm/commit/511a77f6430669f21d358c53c98099562b7ffc03
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T14:37:50+01:00
Commit Message:
AUDIO: Avoid including translations.h in header file
Changed paths:
audio/mods/paula.cpp
audio/null.cpp
audio/null.h
audio/softsynth/appleiigs.cpp
audio/softsynth/pcspk.cpp
audio/softsynth/sid.cpp
po/POTFILES
diff --git a/audio/mods/paula.cpp b/audio/mods/paula.cpp
index 371b52a5724..e5f648528d5 100644
--- a/audio/mods/paula.cpp
+++ b/audio/mods/paula.cpp
@@ -33,6 +33,7 @@
#include <math.h>
#include "common/scummsys.h"
+#include "common/translation.h"
#include "audio/mixer.h"
#include "audio/mods/paula.h"
diff --git a/audio/null.cpp b/audio/null.cpp
index 7e8b6983ae4..1eb79678ab5 100644
--- a/audio/null.cpp
+++ b/audio/null.cpp
@@ -20,8 +20,13 @@
*/
#include "common/error.h"
+#include "common/translation.h"
#include "audio/null.h"
+const char *NullMusicPlugin::getName() const {
+ return _s("No music");
+}
+
Common::Error NullMusicPlugin::createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle) const {
*mididriver = new MidiDriver_NULL();
diff --git a/audio/null.h b/audio/null.h
index 510360a7b33..bbf8c53c8af 100644
--- a/audio/null.h
+++ b/audio/null.h
@@ -24,7 +24,6 @@
#include "audio/musicplugin.h"
#include "audio/mpu401.h"
-#include "common/translation.h"
/* NULL driver */
class MidiDriver_NULL : public MidiDriver_MPU401 {
@@ -39,9 +38,7 @@ public:
class NullMusicPlugin : public MusicPluginObject {
public:
- virtual const char *getName() const {
- return _s("No music");
- }
+ virtual const char *getName() const;
virtual const char *getId() const {
return "null";
diff --git a/audio/softsynth/appleiigs.cpp b/audio/softsynth/appleiigs.cpp
index a1dbd4e6494..c0d6c180621 100644
--- a/audio/softsynth/appleiigs.cpp
+++ b/audio/softsynth/appleiigs.cpp
@@ -19,6 +19,8 @@
*
*/
+#include "common/translation.h"
+
#include "audio/null.h"
// Plugin interface
diff --git a/audio/softsynth/pcspk.cpp b/audio/softsynth/pcspk.cpp
index 2b1518a51a8..7921f8c9533 100644
--- a/audio/softsynth/pcspk.cpp
+++ b/audio/softsynth/pcspk.cpp
@@ -23,6 +23,7 @@
#include "audio/null.h"
#include "common/queue.h"
+#include "common/translation.h"
namespace Audio {
diff --git a/audio/softsynth/sid.cpp b/audio/softsynth/sid.cpp
index 85eef474159..20cfb19e808 100644
--- a/audio/softsynth/sid.cpp
+++ b/audio/softsynth/sid.cpp
@@ -26,6 +26,8 @@
#ifndef DISABLE_SID
+#include "common/translation.h"
+
#include "audio/softsynth/sid.h"
#include "audio/null.h"
diff --git a/po/POTFILES b/po/POTFILES
index 40f1d664660..b8ede028812 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -50,7 +50,6 @@ audio/fmopl.cpp
audio/mididrv.cpp
audio/mods/paula.cpp
audio/null.cpp
-audio/null.h
audio/softsynth/appleiigs.cpp
audio/softsynth/cms.cpp
audio/softsynth/fluidsynth.cpp
Commit: 1f49e54599f2b608045169452c0c7a68d1b1caab
https://github.com/scummvm/scummvm/commit/1f49e54599f2b608045169452c0c7a68d1b1caab
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T14:42:55+01:00
Commit Message:
ANDROID: Avoid including translations.h in a header
Changed paths:
backends/fs/android/android-saf-fs.cpp
backends/fs/android/android-saf-fs.h
po/POTFILES
diff --git a/backends/fs/android/android-saf-fs.cpp b/backends/fs/android/android-saf-fs.cpp
index ea315d3ed5f..7cd2e3b730f 100644
--- a/backends/fs/android/android-saf-fs.cpp
+++ b/backends/fs/android/android-saf-fs.cpp
@@ -54,6 +54,7 @@
#include "backends/fs/posix/posix-iostream.h"
#include "common/debug.h"
+#include "common/translation.h"
#include "common/util.h"
jmethodID AndroidSAFFilesystemNode::_MID_getTreeId = 0;
@@ -685,6 +686,15 @@ AddSAFFakeNode::~AddSAFFakeNode() {
delete _proxied;
}
+Common::U32String AddSAFFakeNode::getDisplayName() const {
+ // I18N: This is displayed in the file browser to let the user choose a new folder for Android Storage Attached Framework
+ return Common::U32String::format("\x01<%s>", _("Add a new folder").c_str());
+}
+
+Common::String AddSAFFakeNode::getName() const {
+ return Common::String::format("\x01<%s>", _("Add a new folder").encode().c_str());
+}
+
AbstractFSNode *AddSAFFakeNode::getChild(const Common::String &name) const {
if (_fromPath) {
// When starting from /saf try to get the tree node
diff --git a/backends/fs/android/android-saf-fs.h b/backends/fs/android/android-saf-fs.h
index f3da7b89d8d..8cb33f45e9c 100644
--- a/backends/fs/android/android-saf-fs.h
+++ b/backends/fs/android/android-saf-fs.h
@@ -24,7 +24,6 @@
#include <jni.h>
-#include "common/translation.h"
#include "backends/fs/abstract-fs.h"
#include "backends/fs/android/android-fs.h"
@@ -174,8 +173,8 @@ public:
bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
// I18N: This is displayed in the file browser to let the user choose a new folder for Android Storage Attached Framework
- Common::U32String getDisplayName() const override { return Common::U32String::format("\x01<%s>", _("Add a new folder").c_str()); };
- Common::String getName() const override { return Common::String::format("\x01<%s>", _("Add a new folder").encode().c_str()); };
+ Common::U32String getDisplayName() const override;
+ Common::String getName() const override;
Common::String getPath() const override;
bool isDirectory() const override { return true; }
diff --git a/po/POTFILES b/po/POTFILES
index b8ede028812..03fcd61192f 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -68,7 +68,6 @@ backends/events/gph/gph-events.cpp
backends/events/maemosdl/maemosdl-events.cpp
backends/events/openpandora/op-events.cpp
backends/fs/android/android-saf-fs.cpp
-backends/fs/android/android-saf-fs.h
backends/graphics/opengl/opengl-graphics.cpp
backends/graphics/openglsdl/openglsdl-graphics.cpp
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
Commit: 30623a0ecf8f445b1fe8ccc37e97dc22e8138047
https://github.com/scummvm/scummvm/commit/30623a0ecf8f445b1fe8ccc37e97dc22e8138047
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T14:50:29+01:00
Commit Message:
I18N: Add missing Atari POTFILES
Changed paths:
po/POTFILES
diff --git a/po/POTFILES b/po/POTFILES
index 03fcd61192f..f9458af8990 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -5,6 +5,7 @@ gui/downloaddialog.cpp
gui/downloadpacksdialog.cpp
gui/editgamedialog.cpp
gui/editrecorddialog.cpp
+gui/error.cpp
gui/filebrowser-dialog.cpp
gui/fluidsynth-dialog.cpp
gui/gui-manager.cpp
@@ -68,6 +69,7 @@ backends/events/gph/gph-events.cpp
backends/events/maemosdl/maemosdl-events.cpp
backends/events/openpandora/op-events.cpp
backends/fs/android/android-saf-fs.cpp
+backends/graphics/atari/atari-graphics.cpp
backends/graphics/opengl/opengl-graphics.cpp
backends/graphics/openglsdl/openglsdl-graphics.cpp
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
Commit: d8cde5a2ec42d6990e75847f075013936d42efe7
https://github.com/scummvm/scummvm/commit/d8cde5a2ec42d6990e75847f075013936d42efe7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T14:50:48+01:00
Commit Message:
GRAPHICS: Remove redundant include
Changed paths:
graphics/fontman.cpp
diff --git a/graphics/fontman.cpp b/graphics/fontman.cpp
index 1d52fe9f327..f89aaee68ad 100644
--- a/graphics/fontman.cpp
+++ b/graphics/fontman.cpp
@@ -23,8 +23,6 @@
#include "graphics/font.h"
#include "graphics/fonts/bdf.h"
-#include "common/translation.h"
-
namespace Common {
DECLARE_SINGLETON(Graphics::FontManager);
}
Commit: 93f52769f655cd4aa2a81abf584f91152d9f48e8
https://github.com/scummvm/scummvm/commit/93f52769f655cd4aa2a81abf584f91152d9f48e8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T14:52:16+01:00
Commit Message:
VCRUISE: Remove unused include
Changed paths:
engines/vcruise/runtime.cpp
diff --git a/engines/vcruise/runtime.cpp b/engines/vcruise/runtime.cpp
index b32bb99e6f2..386aa691f6f 100644
--- a/engines/vcruise/runtime.cpp
+++ b/engines/vcruise/runtime.cpp
@@ -27,7 +27,6 @@
#include "common/random.h"
#include "common/system.h"
#include "common/stream.h"
-#include "common/translation.h"
#include "graphics/cursorman.h"
#include "graphics/font.h"
@@ -2065,7 +2064,7 @@ bool Runtime::parseIndexDef(IndexParseType parseType, uint roomNumber, const Com
uint lastFrame = 0;
if (sscanf(value.c_str(), "%i, %u, %u", &animNum, &firstFrame, &lastFrame) != 3)
error("Malformed room animation def '%s'", value.c_str());
-
+
AnimationDef &animDef = _roomDefs[roomNumber]->animations[key];
animDef.animNum = animNum;
animDef.firstFrame = firstFrame;
@@ -2097,7 +2096,7 @@ bool Runtime::parseIndexDef(IndexParseType parseType, uint roomNumber, const Com
if (!sscanf(value.c_str(), "%u", &varSlot))
error("Malformed var def '%s'", value.c_str());
-
+
_roomDefs[roomNumber]->vars[key] = varSlot;
} break;
case kIndexParseTypeVRoom: {
@@ -2691,7 +2690,7 @@ void Runtime::scriptOpAnimR(ScriptArg_t arg) {
isRight = true;
}
-
+
uint cursorID = 0;
if (_haveHorizPanAnimations) {
uint panCursor = 0;
@@ -3473,7 +3472,7 @@ void Runtime::scriptOpGoto(ScriptArg_t arg) {
uint newInteraction = static_cast<uint>(stackArgs[0]);
Common::SharedPtr<Script> newScript = nullptr;
-
+
if (_scriptSet) {
RoomScriptSetMap_t::const_iterator roomScriptIt = _scriptSet->roomScripts.find(_roomNumber);
if (roomScriptIt != _scriptSet->roomScripts.end()) {
Commit: d5409236c38c62751874ca432010b5ed92532fe2
https://github.com/scummvm/scummvm/commit/d5409236c38c62751874ca432010b5ed92532fe2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T14:54:28+01:00
Commit Message:
ULTIMA: ULTIMA8: Fix I18N includes
Changed paths:
engines/ultima/POTFILES
engines/ultima/ultima8/gumps/cru_menu_gump.cpp
diff --git a/engines/ultima/POTFILES b/engines/ultima/POTFILES
index f86ac9346d2..d57c61542da 100644
--- a/engines/ultima/POTFILES
+++ b/engines/ultima/POTFILES
@@ -8,4 +8,5 @@ engines/ultima/nuvie/metaengine.cpp
engines/ultima/nuvie/save/save_game.cpp
engines/ultima/ultima8/metaengine.cpp
engines/ultima/ultima8/ultima8.cpp
+engines/ultima/ultima8/games/cru_game.cpp
engines/ultima/ultima8/gumps/u8_save_gump.cpp
diff --git a/engines/ultima/ultima8/gumps/cru_menu_gump.cpp b/engines/ultima/ultima8/gumps/cru_menu_gump.cpp
index d6c5a561030..73ad115a604 100644
--- a/engines/ultima/ultima8/gumps/cru_menu_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_menu_gump.cpp
@@ -38,7 +38,6 @@
#include "ultima/ultima8/metaengine.h"
#include "engines/dialogs.h"
-#include "common/translation.h"
#include "gui/saveload.h"
namespace Ultima {
Commit: b1295a7f1d4e4188edbcea32ac613c37a0d1a323
https://github.com/scummvm/scummvm/commit/b1295a7f1d4e4188edbcea32ac613c37a0d1a323
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T14:55:18+01:00
Commit Message:
TRECISION: Remove unused translation.h include
Changed paths:
engines/trecision/resource.cpp
diff --git a/engines/trecision/resource.cpp b/engines/trecision/resource.cpp
index 19cbe2fd0b6..489b7284770 100644
--- a/engines/trecision/resource.cpp
+++ b/engines/trecision/resource.cpp
@@ -24,7 +24,6 @@
#include "common/file.h"
#include "common/savefile.h"
#include "common/str.h"
-#include "common/translation.h"
#include "common/substream.h"
#include "gui/saveload.h"
Commit: 4afbfdf78d63edc17b7174aaa3aa3a5395319176
https://github.com/scummvm/scummvm/commit/4afbfdf78d63edc17b7174aaa3aa3a5395319176
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T15:03:06+01:00
Commit Message:
TETRAEDGE: Fix I18N includes and add POTFILES
Changed paths:
A engines/tetraedge/POTFILES
engines/tetraedge/game/upsell_screen.cpp
diff --git a/engines/tetraedge/POTFILES b/engines/tetraedge/POTFILES
new file mode 100644
index 00000000000..49b5b7c746f
--- /dev/null
+++ b/engines/tetraedge/POTFILES
@@ -0,0 +1 @@
+engines/tetraedge/metaengine.cpp
diff --git a/engines/tetraedge/game/upsell_screen.cpp b/engines/tetraedge/game/upsell_screen.cpp
index a4bfba0ddb5..bad568b9a73 100644
--- a/engines/tetraedge/game/upsell_screen.cpp
+++ b/engines/tetraedge/game/upsell_screen.cpp
@@ -23,8 +23,6 @@
#include "tetraedge/game/application.h"
#include "tetraedge/game/upsell_screen.h"
-#include "common/translation.h"
-
namespace Tetraedge {
UpsellScreen::UpsellScreen() {
Commit: c7c1269c65f1a178e557240b0a64aa4592707846
https://github.com/scummvm/scummvm/commit/c7c1269c65f1a178e557240b0a64aa4592707846
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T15:04:25+01:00
Commit Message:
STARK: Remove unneded translation.h include
Changed paths:
engines/stark/gfx/driver.cpp
diff --git a/engines/stark/gfx/driver.cpp b/engines/stark/gfx/driver.cpp
index 93ef6647ddc..cafee765d5f 100644
--- a/engines/stark/gfx/driver.cpp
+++ b/engines/stark/gfx/driver.cpp
@@ -27,7 +27,6 @@
#include "engines/stark/services/settings.h"
#include "common/config-manager.h"
-#include "common/translation.h"
#include "graphics/renderer.h"
#include "graphics/surface.h"
Commit: 3776ffa8ed2e0285f6d97bacb3ec2b974a215692
https://github.com/scummvm/scummvm/commit/3776ffa8ed2e0285f6d97bacb3ec2b974a215692
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T15:08:50+01:00
Commit Message:
SHERLOCK: Fix translation.h include usage
Changed paths:
engines/sherlock/detection.cpp
engines/sherlock/detection_tables.h
diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index f7e61db06f1..eaac406781d 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -19,7 +19,6 @@
*
*/
-#include "common/translation.h"
#include "engines/advancedDetector.h"
#include "sherlock/detection.h"
diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h
index 9135985f8da..2b812a8958a 100644
--- a/engines/sherlock/detection_tables.h
+++ b/engines/sherlock/detection_tables.h
@@ -19,6 +19,8 @@
*
*/
+#include "common/translation.h"
+
namespace Sherlock {
static const SherlockGameDescription gameDescriptions[] = {
Commit: 87da2b8aae227f76e599f3d4041a1034689f3f20
https://github.com/scummvm/scummvm/commit/87da2b8aae227f76e599f3d4041a1034689f3f20
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T15:09:21+01:00
Commit Message:
ZVISION: Fix I18N include usage
Changed paths:
engines/zvision/POTFILES
engines/zvision/detection.cpp
engines/zvision/detection_tables.h
diff --git a/engines/zvision/POTFILES b/engines/zvision/POTFILES
index cbac3ad2df0..787f0bb0e11 100644
--- a/engines/zvision/POTFILES
+++ b/engines/zvision/POTFILES
@@ -1,5 +1,4 @@
engines/zvision/detection_tables.h
-engines/zvision/detection.cpp
engines/zvision/file/save_manager.cpp
engines/zvision/metaengine.cpp
engines/zvision/zvision.cpp
diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 02953d191f8..96f1449bfe5 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -25,7 +25,6 @@
#include "engines/advancedDetector.h"
-#include "common/translation.h"
#include "common/str-array.h"
#include "zvision/detection.h"
diff --git a/engines/zvision/detection_tables.h b/engines/zvision/detection_tables.h
index 0407de31302..cdeba990c8a 100644
--- a/engines/zvision/detection_tables.h
+++ b/engines/zvision/detection_tables.h
@@ -22,6 +22,8 @@
#ifndef ZVISION_DETECTION_TABLES_H
#define ZVISION_DETECTION_TABLES_H
+#include "common/translation.h"
+
namespace ZVision {
static const PlainGameDescriptor zVisionGames[] = {
Commit: 370794b774fe23e806f4df28c1f2ab508a774cb4
https://github.com/scummvm/scummvm/commit/370794b774fe23e806f4df28c1f2ab508a774cb4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T15:14:49+01:00
Commit Message:
BACKENDS: Added missing POTFILES and added I18N-related comments
Changed paths:
backends/platform/sdl/miyoo/miyoo.cpp
backends/platform/sdl/opendingux/opendingux.cpp
po/POTFILES
diff --git a/backends/platform/sdl/miyoo/miyoo.cpp b/backends/platform/sdl/miyoo/miyoo.cpp
index 95f5c83fc87..a4244855479 100644
--- a/backends/platform/sdl/miyoo/miyoo.cpp
+++ b/backends/platform/sdl/miyoo/miyoo.cpp
@@ -55,39 +55,39 @@
static const Common::KeyTableEntry odKeyboardButtons[] = {
#ifdef MIYOOMINI
- { "JOY_A", Common::KEYCODE_SPACE, _s("A") },
- { "JOY_B", Common::KEYCODE_LCTRL, _s("B") },
- { "JOY_X", Common::KEYCODE_LSHIFT, _s("X") },
- { "JOY_Y", Common::KEYCODE_LALT, _s("Y") },
- { "JOY_BACK", Common::KEYCODE_RCTRL, _s("Select") },
- { "JOY_START", Common::KEYCODE_RETURN, _s("Start") },
- { "JOY_LEFT_SHOULDER", Common::KEYCODE_e, _s("L") },
- { "JOY_RIGHT_SHOULDER", Common::KEYCODE_t, _s("R") },
+ { "JOY_A", Common::KEYCODE_SPACE, _s("A") }, // I18N: Hardware key
+ { "JOY_B", Common::KEYCODE_LCTRL, _s("B") }, // I18N: Hardware key
+ { "JOY_X", Common::KEYCODE_LSHIFT, _s("X") }, // I18N: Hardware key
+ { "JOY_Y", Common::KEYCODE_LALT, _s("Y") }, // I18N: Hardware key
+ { "JOY_BACK", Common::KEYCODE_RCTRL, _s("Select") }, // I18N: Hardware key
+ { "JOY_START", Common::KEYCODE_RETURN, _s("Start") }, // I18N: Hardware key
+ { "JOY_LEFT_SHOULDER", Common::KEYCODE_e, _s("L") }, // I18N: Hardware key
+ { "JOY_RIGHT_SHOULDER", Common::KEYCODE_t, _s("R") }, // I18N: Hardware key
{ "JOY_UP", Common::KEYCODE_UP, _s("D-pad Up") },
{ "JOY_DOWN", Common::KEYCODE_DOWN, _s("D-pad Down") },
{ "JOY_LEFT", Common::KEYCODE_LEFT, _s("D-pad Left") },
{ "JOY_RIGHT", Common::KEYCODE_RIGHT, _s("D-pad Right") },
- { "JOY_LEFT_STICK", Common::KEYCODE_TAB, _s("L2") },
- { "JOY_RIGHT_STICK", Common::KEYCODE_BACKSPACE, _s("R2") },
- { "JOY_GUIDE", Common::KEYCODE_ESCAPE, _s("Menu") },
+ { "JOY_LEFT_STICK", Common::KEYCODE_TAB, _s("L2") }, // I18N: Hardware key
+ { "JOY_RIGHT_STICK", Common::KEYCODE_BACKSPACE, _s("R2") }, // I18N: Hardware key
+ { "JOY_GUIDE", Common::KEYCODE_ESCAPE, _s("Menu") }, // I18N: Hardware key
#else
- { "JOY_A", Common::KEYCODE_LALT, _s("A") },
- { "JOY_B", Common::KEYCODE_LCTRL, _s("B") },
- { "JOY_X", Common::KEYCODE_LSHIFT, _s("X") },
- { "JOY_Y", Common::KEYCODE_SPACE, _s("Y") },
- { "JOY_BACK", Common::KEYCODE_ESCAPE, _s("Select") },
- { "JOY_START", Common::KEYCODE_RETURN, _s("Start") },
- { "JOY_LEFT_SHOULDER", Common::KEYCODE_TAB, _s("L") },
- { "JOY_RIGHT_SHOULDER", Common::KEYCODE_BACKSPACE, _s("R") },
+ { "JOY_A", Common::KEYCODE_LALT, _s("A") }, // I18N: Hardware key
+ { "JOY_B", Common::KEYCODE_LCTRL, _s("B") }, // I18N: Hardware key
+ { "JOY_X", Common::KEYCODE_LSHIFT, _s("X") }, // I18N: Hardware key
+ { "JOY_Y", Common::KEYCODE_SPACE, _s("Y") }, // I18N: Hardware key
+ { "JOY_BACK", Common::KEYCODE_ESCAPE, _s("Select") }, // I18N: Hardware key
+ { "JOY_START", Common::KEYCODE_RETURN, _s("Start") }, // I18N: Hardware key
+ { "JOY_LEFT_SHOULDER", Common::KEYCODE_TAB, _s("L") }, // I18N: Hardware key
+ { "JOY_RIGHT_SHOULDER", Common::KEYCODE_BACKSPACE, _s("R") }, // I18N: Hardware key
{ "JOY_UP", Common::KEYCODE_UP, _s("D-pad Up") },
{ "JOY_DOWN", Common::KEYCODE_DOWN, _s("D-pad Down") },
{ "JOY_LEFT", Common::KEYCODE_LEFT, _s("D-pad Left") },
{ "JOY_RIGHT", Common::KEYCODE_RIGHT, _s("D-pad Right") },
- { "JOY_LEFT_STICK", Common::KEYCODE_PAGEUP, _s("L2") },
- { "JOY_RIGHT_STICK", Common::KEYCODE_PAGEDOWN, _s("R2") },
- { "JOY_LEFT_TRIGGER", Common::KEYCODE_RALT, _s("L3") },
- { "JOY_RIGHT_TRIGGER", Common::KEYCODE_RSHIFT, _s("R3") },
- { "JOY_GUIDE", Common::KEYCODE_RCTRL, _s("Menu") },
+ { "JOY_LEFT_STICK", Common::KEYCODE_PAGEUP, _s("L2") }, // I18N: Hardware key
+ { "JOY_RIGHT_STICK", Common::KEYCODE_PAGEDOWN, _s("R2") }, // I18N: Hardware key
+ { "JOY_LEFT_TRIGGER", Common::KEYCODE_RALT, _s("L3") }, // I18N: Hardware key
+ { "JOY_RIGHT_TRIGGER", Common::KEYCODE_RSHIFT, _s("R3") }, // I18N: Hardware key
+ { "JOY_GUIDE", Common::KEYCODE_RCTRL, _s("Menu") }, // I18N: Hardware key
#endif
{nullptr, Common::KEYCODE_INVALID, nullptr }
};
@@ -214,4 +214,3 @@ Common::HardwareInputSet *OSystem_SDL_Miyoo::getHardwareInputSet() {
return inputSet;
}
-
diff --git a/backends/platform/sdl/opendingux/opendingux.cpp b/backends/platform/sdl/opendingux/opendingux.cpp
index ecac34d97a5..0e525b9dee8 100644
--- a/backends/platform/sdl/opendingux/opendingux.cpp
+++ b/backends/platform/sdl/opendingux/opendingux.cpp
@@ -45,14 +45,14 @@
#define JOYSTICK_DIR "/sys/devices/platform/joystick"
static const Common::KeyTableEntry odKeyboardButtons[] = {
- { "JOY_A", Common::KEYCODE_LCTRL, _s("A") },
- { "JOY_B", Common::KEYCODE_LALT, _s("B") },
- { "JOY_X", Common::KEYCODE_SPACE, _s("X") },
- { "JOY_Y", Common::KEYCODE_LSHIFT, _s("Y") },
- { "JOY_BACK", Common::KEYCODE_ESCAPE, _s("Select") },
- { "JOY_START", Common::KEYCODE_RETURN, _s("Start") },
- { "JOY_LEFT_SHOULDER", Common::KEYCODE_TAB, _s("L") },
- { "JOY_RIGHT_SHOULDER", Common::KEYCODE_BACKSPACE, _s("R") },
+ { "JOY_A", Common::KEYCODE_LCTRL, _s("A") }, // I18N: Hardware key
+ { "JOY_B", Common::KEYCODE_LALT, _s("B") }, // I18N: Hardware key
+ { "JOY_X", Common::KEYCODE_SPACE, _s("X") }, // I18N: Hardware key
+ { "JOY_Y", Common::KEYCODE_LSHIFT, _s("Y") }, // I18N: Hardware key
+ { "JOY_BACK", Common::KEYCODE_ESCAPE, _s("Select") }, // I18N: Hardware key
+ { "JOY_START", Common::KEYCODE_RETURN, _s("Start") }, // I18N: Hardware key
+ { "JOY_LEFT_SHOULDER", Common::KEYCODE_TAB, _s("L") }, // I18N: Hardware key
+ { "JOY_RIGHT_SHOULDER", Common::KEYCODE_BACKSPACE, _s("R") }, // I18N: Hardware key
{ "JOY_UP", Common::KEYCODE_UP, _s("D-pad Up") },
{ "JOY_DOWN", Common::KEYCODE_DOWN, _s("D-pad Down") },
{ "JOY_LEFT", Common::KEYCODE_LEFT, _s("D-pad Left") },
@@ -61,7 +61,7 @@ static const Common::KeyTableEntry odKeyboardButtons[] = {
};
static const Common::HardwareInputTableEntry odJoystickButtons[] = {
- { "JOY_LEFT_TRIGGER", Common::JOYSTICK_BUTTON_LEFT_STICK, _s("L3") },
+ { "JOY_LEFT_TRIGGER", Common::JOYSTICK_BUTTON_LEFT_STICK, _s("L3") }, // I18N: Hardware key
{ nullptr, 0, nullptr }
};
@@ -206,4 +206,3 @@ Common::HardwareInputSet *OSystem_SDL_Opendingux::getHardwareInputSet() {
return inputSet;
}
-
diff --git a/po/POTFILES b/po/POTFILES
index f9458af8990..ecceae764c1 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -99,6 +99,9 @@ backends/platform/ios7/ios7_osys_main.cpp
backends/platform/iphone/osys_events.cpp
backends/platform/maemo/maemo.cpp
backends/platform/sdl/macosx/appmenu_osx.mm
+backends/platform/sdl/macosx/macosx.cpp
+backends/platform/sdl/miyoo/miyoo.cpp
+backends/platform/sdl/opendingux/opendingux.cpp
backends/platform/sdl/ps3/ps3.cpp
backends/platform/sdl/psp2/psp2.cpp
backends/platform/sdl/switch/switch.cpp
Commit: bb2bd83257f1b5d6b6b7fb7ddfbef9e3a886434e
https://github.com/scummvm/scummvm/commit/bb2bd83257f1b5d6b6b7fb7ddfbef9e3a886434e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T15:21:03+01:00
Commit Message:
HADESCH: Remove leftover includes for translation.h
Changed paths:
engines/hadesch/hadesch.h
engines/hadesch/herobelt.cpp
engines/hadesch/rooms/argo.cpp
engines/hadesch/rooms/athena.cpp
engines/hadesch/rooms/catacombs.cpp
engines/hadesch/rooms/crete.cpp
engines/hadesch/rooms/ferry.cpp
engines/hadesch/rooms/minotaur.cpp
engines/hadesch/rooms/monster.cpp
engines/hadesch/rooms/monster/illusion.cpp
engines/hadesch/rooms/quiz.cpp
engines/hadesch/rooms/seriphos.cpp
engines/hadesch/video.cpp
diff --git a/engines/hadesch/hadesch.h b/engines/hadesch/hadesch.h
index 025d2073186..d1f31adcece 100644
--- a/engines/hadesch/hadesch.h
+++ b/engines/hadesch/hadesch.h
@@ -39,7 +39,6 @@
#include "hadesch/event.h"
#include "hadesch/herobelt.h"
#include "hadesch/persistent.h"
-#include "common/translation.h"
#define _hs(x) (x)
@@ -48,6 +47,7 @@ struct ADGameDescription;
namespace Common {
class SeekableReadStream;
class PEResources;
+class TranslationManager;
}
namespace Graphics {
diff --git a/engines/hadesch/herobelt.cpp b/engines/hadesch/herobelt.cpp
index 6588a5660f0..7c9cdb05b29 100644
--- a/engines/hadesch/herobelt.cpp
+++ b/engines/hadesch/herobelt.cpp
@@ -30,7 +30,6 @@
#include "audio/decoders/aiff.h"
#include "hadesch/pod_file.h"
#include "hadesch/baptr.h"
-#include "common/translation.h"
namespace Hadesch {
diff --git a/engines/hadesch/rooms/argo.cpp b/engines/hadesch/rooms/argo.cpp
index 5524c5d976a..6a3bf7e1c79 100644
--- a/engines/hadesch/rooms/argo.cpp
+++ b/engines/hadesch/rooms/argo.cpp
@@ -22,7 +22,6 @@
*/
#include "hadesch/hadesch.h"
#include "hadesch/video.h"
-#include "common/translation.h"
namespace Hadesch {
diff --git a/engines/hadesch/rooms/athena.cpp b/engines/hadesch/rooms/athena.cpp
index 9fc235883ee..0a59e6c13e7 100644
--- a/engines/hadesch/rooms/athena.cpp
+++ b/engines/hadesch/rooms/athena.cpp
@@ -23,7 +23,6 @@
#include "hadesch/hadesch.h"
#include "hadesch/video.h"
#include "hadesch/ambient.h"
-#include "common/translation.h"
namespace Hadesch {
static const char *kAthenaAnim = "c8060ba0";
diff --git a/engines/hadesch/rooms/catacombs.cpp b/engines/hadesch/rooms/catacombs.cpp
index 48e39d6a154..07259ddb64e 100644
--- a/engines/hadesch/rooms/catacombs.cpp
+++ b/engines/hadesch/rooms/catacombs.cpp
@@ -23,7 +23,6 @@
#include "hadesch/hadesch.h"
#include "hadesch/video.h"
#include "hadesch/ambient.h"
-#include "common/translation.h"
namespace Hadesch {
diff --git a/engines/hadesch/rooms/crete.cpp b/engines/hadesch/rooms/crete.cpp
index e8954c86dda..87a4b04c103 100644
--- a/engines/hadesch/rooms/crete.cpp
+++ b/engines/hadesch/rooms/crete.cpp
@@ -23,7 +23,6 @@
#include "hadesch/hadesch.h"
#include "hadesch/video.h"
#include "hadesch/ambient.h"
-#include "common/translation.h"
namespace Hadesch {
diff --git a/engines/hadesch/rooms/ferry.cpp b/engines/hadesch/rooms/ferry.cpp
index 07d410d5be0..254aebb92e6 100644
--- a/engines/hadesch/rooms/ferry.cpp
+++ b/engines/hadesch/rooms/ferry.cpp
@@ -22,7 +22,6 @@
*/
#include "hadesch/hadesch.h"
#include "hadesch/video.h"
-#include "common/translation.h"
#include "gui/message.h"
diff --git a/engines/hadesch/rooms/minotaur.cpp b/engines/hadesch/rooms/minotaur.cpp
index fcece9c7480..8ecb847fcc7 100644
--- a/engines/hadesch/rooms/minotaur.cpp
+++ b/engines/hadesch/rooms/minotaur.cpp
@@ -23,7 +23,6 @@
#include "hadesch/hadesch.h"
#include "hadesch/video.h"
#include "hadesch/ambient.h"
-#include "common/translation.h"
namespace Hadesch {
static const char *kHighlightImage = "r6010ol0";
diff --git a/engines/hadesch/rooms/monster.cpp b/engines/hadesch/rooms/monster.cpp
index ee05743743d..efd4047e88f 100644
--- a/engines/hadesch/rooms/monster.cpp
+++ b/engines/hadesch/rooms/monster.cpp
@@ -23,7 +23,6 @@
#include "hadesch/hadesch.h"
#include "hadesch/video.h"
#include "hadesch/rooms/monster.h"
-#include "common/translation.h"
namespace Hadesch {
enum {
diff --git a/engines/hadesch/rooms/monster/illusion.cpp b/engines/hadesch/rooms/monster/illusion.cpp
index 7c21f77a533..8588905b611 100644
--- a/engines/hadesch/rooms/monster/illusion.cpp
+++ b/engines/hadesch/rooms/monster/illusion.cpp
@@ -21,7 +21,6 @@
*
*/
-#include "common/translation.h"
#include "hadesch/hadesch.h"
#include "hadesch/video.h"
#include "hadesch/rooms/monster.h"
diff --git a/engines/hadesch/rooms/quiz.cpp b/engines/hadesch/rooms/quiz.cpp
index 755bbe7797c..8fb8147bdd3 100644
--- a/engines/hadesch/rooms/quiz.cpp
+++ b/engines/hadesch/rooms/quiz.cpp
@@ -23,7 +23,6 @@
#include "hadesch/hadesch.h"
#include "hadesch/video.h"
#include "hadesch/ambient.h"
-#include "common/translation.h"
namespace Hadesch {
diff --git a/engines/hadesch/rooms/seriphos.cpp b/engines/hadesch/rooms/seriphos.cpp
index ad8181c2c2a..f9b2db4bfde 100644
--- a/engines/hadesch/rooms/seriphos.cpp
+++ b/engines/hadesch/rooms/seriphos.cpp
@@ -23,7 +23,6 @@
#include "hadesch/hadesch.h"
#include "hadesch/video.h"
#include "hadesch/ambient.h"
-#include "common/translation.h"
namespace Hadesch {
static const char *kApolloHighlight = "c7400ba0";
diff --git a/engines/hadesch/video.cpp b/engines/hadesch/video.cpp
index 6fdc6e55f66..0b04f781fea 100644
--- a/engines/hadesch/video.cpp
+++ b/engines/hadesch/video.cpp
@@ -31,7 +31,6 @@
#include "audio/decoders/aiff.h"
#include "hadesch/pod_file.h"
#include "hadesch/baptr.h"
-#include "common/translation.h"
#include "common/macresman.h"
static const int kVideoMaxW = 1280;
Commit: 51ae8a73819c89434bd7d742705c488bf514120b
https://github.com/scummvm/scummvm/commit/51ae8a73819c89434bd7d742705c488bf514120b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T15:24:28+01:00
Commit Message:
I18N: Added some files to POTFILES
They are not using the translations per se, but make the check
script simpler.
Changed paths:
po/POTFILES
diff --git a/po/POTFILES b/po/POTFILES
index ecceae764c1..34db0183512 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -30,7 +30,9 @@ gui/widgets/groupedlist.cpp
base/main.cpp
common/error.cpp
+common/localization.cpp
common/rendermode.cpp
+common/translation.cpp
common/updates.cpp
common/util.cpp
@@ -107,4 +109,7 @@ backends/platform/sdl/psp2/psp2.cpp
backends/platform/sdl/switch/switch.cpp
backends/platform/wii/options.cpp
backends/presence/discord/discord.cpp
+backends/text-to-speech/linux/linux-text-to-speech.cpp
+backends/text-to-speech/macosx/macosx-text-to-speech.mm
+backends/text-to-speech/windows/windows-text-to-speech.cpp
backends/updates/macosx/macosx-updates.mm
Commit: 8c4ee259cb7d2be623b6f96a8097aeb0197d7b78
https://github.com/scummvm/scummvm/commit/8c4ee259cb7d2be623b6f96a8097aeb0197d7b78
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T15:26:13+01:00
Commit Message:
AGI: Fix I18N includes
Changed paths:
engines/agi/detection.cpp
engines/agi/detection_tables.h
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index b5b0dd75eb1..9c817deafdb 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -21,7 +21,6 @@
#include "common/config-manager.h"
-#include "common/translation.h"
#include "common/system.h"
#include "common/debug.h"
diff --git a/engines/agi/detection_tables.h b/engines/agi/detection_tables.h
index 09fd66d784f..18f3b9ba588 100644
--- a/engines/agi/detection_tables.h
+++ b/engines/agi/detection_tables.h
@@ -19,6 +19,8 @@
*
*/
+#include "common/translation.h"
+
namespace Agi {
#define GAMEOPTIONS_DEFAULT GUIO4(GAMEOPTION_ORIGINAL_SAVELOAD,GAMEOPTION_DISABLE_MOUSE,GAMEOPTION_USE_HERCULES_FONT,GAMEOPTION_COMMAND_PROMPT_WINDOW)
Commit: c32d884b740e58b6b4243ce3cc6505b26abb77ad
https://github.com/scummvm/scummvm/commit/c32d884b740e58b6b4243ce3cc6505b26abb77ad
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T15:33:39+01:00
Commit Message:
BBVS: Added POTFILES. The file is not translatable but makes automated checks simpler
Changed paths:
A engines/bbvs/POTFILES
diff --git a/engines/bbvs/POTFILES b/engines/bbvs/POTFILES
new file mode 100644
index 00000000000..6aafc3ebfe2
--- /dev/null
+++ b/engines/bbvs/POTFILES
@@ -0,0 +1 @@
+engines/bbvs/bbvs.cpp
Commit: 709a593e5c872cf2e18e98de3b626cd1a5383e8f
https://github.com/scummvm/scummvm/commit/709a593e5c872cf2e18e98de3b626cd1a5383e8f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T15:39:10+01:00
Commit Message:
DIRECTOR: Added missing POTFILES
Changed paths:
engines/director/POTFILES
diff --git a/engines/director/POTFILES b/engines/director/POTFILES
index 273bb645ec0..99d3e5df47f 100644
--- a/engines/director/POTFILES
+++ b/engines/director/POTFILES
@@ -1,2 +1,3 @@
engines/director/events.cpp
engines/director/lingo/lingo-builtins.cpp
+engines/director/lingo/xlibs/jitdraw3.cpp
Commit: 1516aee14a2fc0a19d419049cd353592f365c86b
https://github.com/scummvm/scummvm/commit/1516aee14a2fc0a19d419049cd353592f365c86b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T15:46:45+01:00
Commit Message:
SCI: Fix POTFILES
Changed paths:
engines/sci/POTFILES
engines/sci/detection.cpp
engines/sci/detection_options.h
engines/sci/detection_tables.h
diff --git a/engines/sci/POTFILES b/engines/sci/POTFILES
index d15ed01a5bf..2510081fe87 100644
--- a/engines/sci/POTFILES
+++ b/engines/sci/POTFILES
@@ -1,6 +1,6 @@
-engines/sci/detection.cpp
engines/sci/detection_options.h
engines/sci/detection_tables.h
+engines/sci/dialogs.cpp
engines/sci/engine/guest_additions.cpp
engines/sci/engine/kfile.cpp
engines/sci/engine/kgraphics.cpp
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 8103b794847..2f1a38a2118 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -24,7 +24,6 @@
#include "common/file.h"
#include "common/hashmap.h"
#include "common/ptr.h"
-#include "common/translation.h"
#include "gui/ThemeEval.h"
#include "gui/widget.h"
@@ -119,7 +118,7 @@ static const PlainGameDescriptor s_sciGameTitles[] = {
{"hoyle4", "Hoyle Classic Card Games"},
{"inndemo", "ImagiNation Network (INN) Demo"},
{"kq6", "King's Quest VI: Heir Today, Gone Tomorrow"},
- {"laurabow2", "Laura Bow II: The Dagger of Amon Ra"},
+ {"laurabow2", "Laura Bow II: The Dagger of Amon Ra"},
{"qfg1vga", "Quest for Glory I: So You Want to Be a Hero"}, // Note: There was also a SCI0 version of this (further up) called Hero's Quest: So You Want to Be a Hero
{"qfg3", "Quest for Glory III: Wages of War"},
{"sq5", "Space Quest V: The Next Mutation"},
diff --git a/engines/sci/detection_options.h b/engines/sci/detection_options.h
index d03dff624b7..cc77d65f255 100644
--- a/engines/sci/detection_options.h
+++ b/engines/sci/detection_options.h
@@ -22,6 +22,8 @@
#ifndef SCI_DETECTION_OPTIONS_H
#define SCI_DETECTION_OPTIONS_H
+#include "common/translation.h"
+
namespace Sci {
const ADExtraGuiOptionsMap optionsList[] = {
diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index e912dc17e8d..9cf44c654ac 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -19,6 +19,8 @@
*
*/
+#include "common/translation.h"
+
namespace Sci {
#define GUIO_STD16 GUIO6(GUIO_NOSPEECH, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_MIDI_MODE, GAMEOPTION_RGB_RENDERING, GAMEOPTION_TTS)
@@ -1008,7 +1010,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
{"ressci.000", 0, "a19fc3604c6e5407abcf03d59ee87217", 168522221},
AD_LISTEND},
Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO_GK2 },
-
+
// Gabriel Knight 2 - Korean DOS (GOG version) (from swkim01)
// using swkim01's SCI Message Editor: http://github.com/swkim01/scime/
{"gk2", "", {
@@ -1596,7 +1598,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
{"resource.001", 0, "143e1c14f15ad0fbfc714f648a65f661", 205330},
AD_LISTEND},
Common::EN_ANY, Common::kPlatformDOS, ADGF_DEMO, GUIO_STD16_UNDITHER },
-
+
// King's Quest 4 - English DOS (5 1/4" disks)
// Game version 1.000.106
// Executable scanning reports 0.000.253
Commit: f378ec4242083e4b3ba8ea8dfc564a8d29fc5849
https://github.com/scummvm/scummvm/commit/f378ec4242083e4b3ba8ea8dfc564a8d29fc5849
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T15:48:41+01:00
Commit Message:
MTROPOLIS: Fix POTFILES
Changed paths:
engines/mtropolis/POTFILES
engines/mtropolis/detection_tables.h
diff --git a/engines/mtropolis/POTFILES b/engines/mtropolis/POTFILES
index d28bd9c5a1a..80f412d769e 100644
--- a/engines/mtropolis/POTFILES
+++ b/engines/mtropolis/POTFILES
@@ -1,3 +1,2 @@
engines/mtropolis/metaengine.cpp
-engines/mtropolis/mtropolis.cpp
engines/mtropolis/saveload.cpp
diff --git a/engines/mtropolis/detection_tables.h b/engines/mtropolis/detection_tables.h
index c0c07baa775..4731b5ee53d 100644
--- a/engines/mtropolis/detection_tables.h
+++ b/engines/mtropolis/detection_tables.h
@@ -463,7 +463,7 @@ static const MTropolisGameDescription gameDescriptions[] = {
0,
MTBOOT_MTI_DEMO_WIN,
},
-
+
{ // Uncle Albert's Magical Album (German, Windows)
// Original title: Onkel Alberts geheimnisvolles Notizbuch
// Published by Tivola, 1998
Commit: 23168876096a502d5e3936cb2acb367b7317288d
https://github.com/scummvm/scummvm/commit/23168876096a502d5e3936cb2acb367b7317288d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T15:51:01+01:00
Commit Message:
HPL1: Remove unused translation.h includes
Changed paths:
engines/hpl1/detection.cpp
engines/neverhood/metaengine.cpp
diff --git a/engines/hpl1/detection.cpp b/engines/hpl1/detection.cpp
index c1fff5cfaeb..d6ca4b23305 100644
--- a/engines/hpl1/detection.cpp
+++ b/engines/hpl1/detection.cpp
@@ -24,7 +24,6 @@
#include "common/file.h"
#include "common/md5.h"
#include "common/str-array.h"
-#include "common/translation.h"
#include "common/util.h"
#include "hpl1/detection.h"
#include "hpl1/detection_tables.h"
diff --git a/engines/neverhood/metaengine.cpp b/engines/neverhood/metaengine.cpp
index 0de8b117d69..a36bbc6bc8c 100644
--- a/engines/neverhood/metaengine.cpp
+++ b/engines/neverhood/metaengine.cpp
@@ -23,7 +23,6 @@
#include "engines/advancedDetector.h"
#include "common/file.h"
-#include "common/translation.h"
#include "neverhood/dialogs.h"
#include "neverhood/neverhood.h"
Commit: d66a77a9b77566a9e3805cf86ba5632fe5ba667c
https://github.com/scummvm/scummvm/commit/d66a77a9b77566a9e3805cf86ba5632fe5ba667c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T15:53:45+01:00
Commit Message:
SCUMM: Made pre-release checker happier in relation to I18N
Changed paths:
engines/scumm/detection_internal.h
diff --git a/engines/scumm/detection_internal.h b/engines/scumm/detection_internal.h
index f7e6bb76fba..e009144ee8b 100644
--- a/engines/scumm/detection_internal.h
+++ b/engines/scumm/detection_internal.h
@@ -25,6 +25,7 @@
#include "common/debug.h"
#include "common/md5.h"
#include "common/punycode.h"
+#include "common/translation.h"
#include "gui/error.h"
Commit: 67c01ef9bd3cf013a3ffd580fc3348a124606521
https://github.com/scummvm/scummvm/commit/67c01ef9bd3cf013a3ffd580fc3348a124606521
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T15:55:12+01:00
Commit Message:
NEVERHOOD: Fix POTFILES
Changed paths:
engines/neverhood/POTFILES
diff --git a/engines/neverhood/POTFILES b/engines/neverhood/POTFILES
index ebc6ce6db48..a5e485a8f64 100644
--- a/engines/neverhood/POTFILES
+++ b/engines/neverhood/POTFILES
@@ -1,3 +1,2 @@
engines/neverhood/dialogs.cpp
engines/neverhood/menumodule.cpp
-engines/neverhood/metaengine.cpp
Commit: 02a28ad7aa8a79c49363b064efa8bed1daafda0d
https://github.com/scummvm/scummvm/commit/02a28ad7aa8a79c49363b064efa8bed1daafda0d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T15:56:37+01:00
Commit Message:
MOHAWK: Fix I18N usage
Changed paths:
engines/mohawk/POTFILES
engines/mohawk/detection.cpp
engines/mohawk/detection_tables.h
diff --git a/engines/mohawk/POTFILES b/engines/mohawk/POTFILES
index d13e542a30f..35780eeb626 100644
--- a/engines/mohawk/POTFILES
+++ b/engines/mohawk/POTFILES
@@ -1,5 +1,4 @@
engines/mohawk/detection_tables.h
-engines/mohawk/detection.cpp
engines/mohawk/dialogs.cpp
engines/mohawk/metaengine.cpp
engines/mohawk/mohawk.cpp
diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp
index ef43ac7ebb9..a612088a852 100644
--- a/engines/mohawk/detection.cpp
+++ b/engines/mohawk/detection.cpp
@@ -24,7 +24,6 @@
#include "engines/advancedDetector.h"
#include "common/config-manager.h"
#include "common/textconsole.h"
-#include "common/translation.h"
#include "mohawk/detection.h"
diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index 470384a68ad..9951986d5a5 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -19,6 +19,8 @@
*
*/
+#include "common/translation.h"
+
namespace Mohawk {
#define GUI_OPTIONS_MYST GUIO4(GUIO_NOASPECT, GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOMIDI)
Commit: 8381a9d4d610d536a8ed1a565760f4d17205a28f
https://github.com/scummvm/scummvm/commit/8381a9d4d610d536a8ed1a565760f4d17205a28f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T16:06:34+01:00
Commit Message:
MM: MM1: Properly mark keybindings for translation and add to POTFILES
Changed paths:
engines/mm/POTFILES
engines/mm/mm1/metaengine.cpp
diff --git a/engines/mm/POTFILES b/engines/mm/POTFILES
index 364d0e6c6d9..ece789cbbac 100644
--- a/engines/mm/POTFILES
+++ b/engines/mm/POTFILES
@@ -1,4 +1,5 @@
engines/mm/detection.cpp
engines/mm/metaengine.cpp
+engines/mm/mm1/metaengine.cpp
engines/mm/shared/utils/engine_data.cpp
engines/mm/xeen/saves.cpp
diff --git a/engines/mm/mm1/metaengine.cpp b/engines/mm/mm1/metaengine.cpp
index 3bbf834f775..1a1a98f9a23 100644
--- a/engines/mm/mm1/metaengine.cpp
+++ b/engines/mm/mm1/metaengine.cpp
@@ -37,62 +37,62 @@ struct KeybindingRecord {
};
static const KeybindingRecord MENU_KEYS[] = {
- { KEYBIND_ESCAPE, "ESCAPE", "Escape", "ESCAPE", nullptr },
- { KEYBIND_SELECT, "SELECT", "Select", "RETURN", nullptr },
+ { KEYBIND_ESCAPE, "ESCAPE", _s("Escape"), "ESCAPE", nullptr }, // I18N: ESC key
+ { KEYBIND_SELECT, "SELECT", _s("Select"), "RETURN", nullptr }, // I18N: Return key
{ KEYBIND_NONE, nullptr, nullptr, nullptr, nullptr }
};
static const KeybindingRecord PARTY_KEYS[] = {
- { KEYBIND_VIEW_PARTY1, "PARTY1", "View Party Member 1", "1", nullptr },
- { KEYBIND_VIEW_PARTY2, "PARTY2", "View Party Member 2", "2", nullptr },
- { KEYBIND_VIEW_PARTY3, "PARTY3", "View Party Member 3", "3", nullptr },
- { KEYBIND_VIEW_PARTY4, "PARTY4", "View Party Member 4", "4", nullptr },
- { KEYBIND_VIEW_PARTY5, "PARTY5", "View Party Member 5", "5", nullptr },
- { KEYBIND_VIEW_PARTY6, "PARTY6", "View Party Member 6", "6", nullptr },
+ { KEYBIND_VIEW_PARTY1, "PARTY1", _s("View Party Member 1"), "1", nullptr },
+ { KEYBIND_VIEW_PARTY2, "PARTY2", _s("View Party Member 2"), "2", nullptr },
+ { KEYBIND_VIEW_PARTY3, "PARTY3", _s("View Party Member 3"), "3", nullptr },
+ { KEYBIND_VIEW_PARTY4, "PARTY4", _s("View Party Member 4"), "4", nullptr },
+ { KEYBIND_VIEW_PARTY5, "PARTY5", _s("View Party Member 5"), "5", nullptr },
+ { KEYBIND_VIEW_PARTY6, "PARTY6", _s("View Party Member 6"), "6", nullptr },
{ KEYBIND_NONE, nullptr, nullptr, nullptr, nullptr }
};
static const KeybindingRecord COMBAT_KEYS[] = {
- { KEYBIND_COMBAT_ATTACK, "COMBAT_ATTACK", "Attack", "a", nullptr },
- { KEYBIND_COMBAT_BLOCK, "COMBAT_BLOCK", "Block", "b", nullptr },
- { KEYBIND_COMBAT_CAST, "COMBAT_CAST", "Cast", "c", nullptr },
- { KEYBIND_COMBAT_EXCHANGE, "COMBAT_EXCHANGE", "Exchange", "e", nullptr },
- { KEYBIND_COMBAT_FIGHT, "COMBAT_FIGHT", "Fight", "f", nullptr },
- { KEYBIND_QUICKREF, "QUICKREF", "Quick Reference", "q", nullptr },
- { KEYBIND_COMBAT_RETREAT, "COMBAT_RETREAT", "Retreat", "r", nullptr },
- { KEYBIND_COMBAT_SHOOT, "COMBAT_SHOOT", "Shoot", "s", nullptr },
- { KEYBIND_COMBAT_USE, "COMBAT_USE", "Use", "u", nullptr },
-
- { KEYBIND_DELAY, "DELAY", "Delay", "d", nullptr },
- { KEYBIND_PROTECT, "PROTECT", "Protect", "p", nullptr },
+ { KEYBIND_COMBAT_ATTACK, "COMBAT_ATTACK", _s("Attack"), "a", nullptr }, // I18N: Combat command in MM1
+ { KEYBIND_COMBAT_BLOCK, "COMBAT_BLOCK", _s("Block"), "b", nullptr }, // I18N: Combat command in MM1
+ { KEYBIND_COMBAT_CAST, "COMBAT_CAST", _s("Cast"), "c", nullptr }, // I18N: Combat command in MM1
+ { KEYBIND_COMBAT_EXCHANGE, "COMBAT_EXCHANGE", _s("Exchange"), "e", nullptr }, // I18N: Combat command in MM1
+ { KEYBIND_COMBAT_FIGHT, "COMBAT_FIGHT", _s("Fight"), "f", nullptr }, // I18N: Combat command in MM1
+ { KEYBIND_QUICKREF, "QUICKREF", _s("Quick Reference"), "q", nullptr }, // I18N: Combat command in MM1
+ { KEYBIND_COMBAT_RETREAT, "COMBAT_RETREAT", _s("Retreat"), "r", nullptr }, // I18N: Combat command in MM1
+ { KEYBIND_COMBAT_SHOOT, "COMBAT_SHOOT", _s("Shoot"), "s", nullptr }, // I18N: Combat command in MM1
+ { KEYBIND_COMBAT_USE, "COMBAT_USE", _s("Use"), "u", nullptr }, // I18N: Combat command in MM1
+
+ { KEYBIND_DELAY, "DELAY", _s("Delay"), "d", nullptr }, // I18N: Combat command in MM1
+ { KEYBIND_PROTECT, "PROTECT", _s("Protect"), "p", nullptr }, // I18N: Combat command in MM1
{ KEYBIND_NONE, nullptr, nullptr, nullptr, nullptr }
};
static const KeybindingRecord NORMAL_KEYS[] = {
- { KEYBIND_SELECT, "SELECT", "Select", "RETURN", nullptr },
- { KEYBIND_FORWARDS, "FORWARDS", "Forwards", "UP", nullptr },
- { KEYBIND_BACKWARDS, "BACKWARDS", "Backwards", "DOWN", nullptr },
- { KEYBIND_TURN_LEFT, "TURN_LEFT", "Turn Left", "LEFT", nullptr },
- { KEYBIND_TURN_RIGHT, "TURN_RIGHT", "Turn Right", "RIGHT", nullptr },
- { KEYBIND_STRAFE_LEFT, "STRAFE_LEFT", "Strafe Left", "C+LEFT", nullptr },
- { KEYBIND_STRAFE_RIGHT, "STRAFE_RIGHT", "Strafe Right", "C+RIGHT", nullptr },
-
- { KEYBIND_SPELL, "CAST", "Cast Spell", "c", nullptr },
- { KEYBIND_MAP, "MAP", "Show Map", "m", nullptr },
- { KEYBIND_MINIMAP, "MINIMAP", "Toggle Minimap", "=", nullptr },
- { KEYBIND_ORDER, "ORDER", "Reorder Party", "o", nullptr },
- { KEYBIND_PROTECT, "PROTECT", "Protect", "p", nullptr },
- { KEYBIND_REST, "REST", "Rest", "r", nullptr },
- { KEYBIND_SEARCH, "SEARCH", "Search", "s", nullptr },
- { KEYBIND_BASH, "BASH", "Bash", "b", nullptr },
- { KEYBIND_UNLOCK, "UNLOCK", "Unlock", "u", nullptr },
- { KEYBIND_QUICKREF, "QUICKREF", "Quick Reference", "q", nullptr },
+ { KEYBIND_SELECT, "SELECT", _s("Select"), "RETURN", nullptr }, // I18N: Select party member command in MM1
+ { KEYBIND_FORWARDS, "FORWARDS", _s("Forwards"), "UP", nullptr }, // I18N: Directionalcommand in MM1
+ { KEYBIND_BACKWARDS, "BACKWARDS", _s("Backwards"), "DOWN", nullptr }, // I18N: Directionalcommand in MM1
+ { KEYBIND_TURN_LEFT, "TURN_LEFT", _s("Turn Left"), "LEFT", nullptr },
+ { KEYBIND_TURN_RIGHT, "TURN_RIGHT", _s("Turn Right"), "RIGHT", nullptr },
+ { KEYBIND_STRAFE_LEFT, "STRAFE_LEFT", _s("Strafe Left"), "C+LEFT", nullptr },
+ { KEYBIND_STRAFE_RIGHT, "STRAFE_RIGHT", _s("Strafe Right"), "C+RIGHT", nullptr },
+
+ { KEYBIND_SPELL, "CAST", _s("Cast Spell"), "c", nullptr },
+ { KEYBIND_MAP, "MAP", _s("Show Map"), "m", nullptr },
+ { KEYBIND_MINIMAP, "MINIMAP", _s("Toggle Minimap"), "=", nullptr },
+ { KEYBIND_ORDER, "ORDER", _s("Reorder Party"), "o", nullptr },
+ { KEYBIND_PROTECT, "PROTECT", _s("Protect"), "p", nullptr }, // I18N: Action of hero party in MM1
+ { KEYBIND_REST, "REST", _s("Rest"), "r", nullptr }, // I18N: Action of hero party in MM1
+ { KEYBIND_SEARCH, "SEARCH", _s("Search"), "s", nullptr }, // I18N: Action of hero party in MM1
+ { KEYBIND_BASH, "BASH", _s("Bash"), "b", nullptr }, // I18N: Action of hero party in MM1
+ { KEYBIND_UNLOCK, "UNLOCK", _s("Unlock"), "u", nullptr }, // I18N: Action of hero party in MM1
+ { KEYBIND_QUICKREF, "QUICKREF", _s("Quick Reference"), "q", nullptr },
{ KEYBIND_NONE, nullptr, nullptr, nullptr, nullptr }
};
static const KeybindingRecord CHEAT_KEYS[] = {
- { KEYBIND_CHEAT_GOTO, "CHEAT-GOTO", "Goto location", "A+g", nullptr },
+ { KEYBIND_CHEAT_GOTO, "CHEAT-GOTO", _s("Goto location"), "A+g", nullptr },
{ KEYBIND_NONE, nullptr, nullptr, nullptr, nullptr }
};
@@ -103,26 +103,26 @@ struct KeysRecord {
};
static const KeysRecord MENU_RECORDS[] = {
- { "mm1", "Might and Magic 1 - Menus", MENU_KEYS },
+ { "mm1", _s("Might and Magic 1 - Menus"), MENU_KEYS },
{ nullptr, nullptr, nullptr }
};
static const KeysRecord PARTY_MENU_RECORDS[] = {
- { "mm1", "Might and Magic 1 - Menus", MENU_KEYS },
- { "mm1_party", "Might and Magic 1 - Party", PARTY_KEYS },
+ { "mm1", _s("Might and Magic 1 - Menus"), MENU_KEYS },
+ { "mm1_party", _s("Might and Magic 1 - Party"), PARTY_KEYS },
{ nullptr, nullptr, nullptr }
};
static const KeysRecord COMBAT_MENU_RECORDS[] = {
- { "mm1_combat", "Might and Magic 1 - Combat", COMBAT_KEYS },
- { "mm1_party", "Might and Magic 1 - Party", PARTY_KEYS },
+ { "mm1_combat", _s("Might and Magic 1 - Combat"), COMBAT_KEYS },
+ { "mm1_party", _s("Might and Magic 1 - Party"), PARTY_KEYS },
{ nullptr, nullptr, nullptr }
};
static const KeysRecord NORMAL_RECORDS[] = {
- { "mm1", "Might and Magic 1", NORMAL_KEYS },
- { "mm1_party", "Might and Magic 1 - Party", PARTY_KEYS },
- { "mm1_cheats", "Might and Magic 1 - Cheats", CHEAT_KEYS },
+ { "mm1", _s("Might and Magic 1"), NORMAL_KEYS },
+ { "mm1_party", _s("Might and Magic 1 - Party"), PARTY_KEYS },
+ { "mm1_cheats", _s("Might and Magic 1 - Cheats"), CHEAT_KEYS },
{ nullptr, nullptr, nullptr }
};
Commit: 3607d9c9908a4c3f8528801cf9b6ae41567f05c0
https://github.com/scummvm/scummvm/commit/3607d9c9908a4c3f8528801cf9b6ae41567f05c0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T16:07:46+01:00
Commit Message:
BLADERUNNER: Remove unnecessary translation.h include
Changed paths:
engines/bladerunner/detection.cpp
diff --git a/engines/bladerunner/detection.cpp b/engines/bladerunner/detection.cpp
index 7326616c88e..4ece6b922d3 100644
--- a/engines/bladerunner/detection.cpp
+++ b/engines/bladerunner/detection.cpp
@@ -28,7 +28,6 @@
#include "common/system.h"
#include "common/savefile.h"
#include "common/serializer.h"
-#include "common/translation.h"
#include "engines/advancedDetector.h"
Commit: d327079f24489e829eb79d3d6a89eda58396a928
https://github.com/scummvm/scummvm/commit/d327079f24489e829eb79d3d6a89eda58396a928
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T16:09:01+01:00
Commit Message:
BURIED: Fix POTFILES
Changed paths:
engines/buried/POTFILES
diff --git a/engines/buried/POTFILES b/engines/buried/POTFILES
index dc445692a60..29e51486243 100644
--- a/engines/buried/POTFILES
+++ b/engines/buried/POTFILES
@@ -1,4 +1,3 @@
-engines/buried/biochip_view.cpp
engines/buried/buried.cpp
engines/buried/metaengine.cpp
engines/buried/saveload.cpp
Commit: 5b908cafcb541b525bff4b145969eda88c80726e
https://github.com/scummvm/scummvm/commit/5b908cafcb541b525bff4b145969eda88c80726e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T16:10:14+01:00
Commit Message:
GLK: Removed unnecessary translations.h include
Changed paths:
engines/glk/detection.cpp
diff --git a/engines/glk/detection.cpp b/engines/glk/detection.cpp
index cc2f3932298..5ee75a09500 100644
--- a/engines/glk/detection.cpp
+++ b/engines/glk/detection.cpp
@@ -59,7 +59,6 @@
#include "graphics/surface.h"
#include "common/config-manager.h"
#include "common/file.h"
-#include "common/translation.h"
static const DebugChannelDef debugFlagList[] = {
{Glk::kDebugCore, "core", "Core engine debug level"},
Commit: a3cac76eb489c24fce3b5cb1b364dec9f787c107
https://github.com/scummvm/scummvm/commit/a3cac76eb489c24fce3b5cb1b364dec9f787c107
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T16:13:12+01:00
Commit Message:
GROOVIE: Fixes to I18N lists and includes
Changed paths:
engines/groovie/POTFILES
engines/groovie/logic/tlcgame.cpp
engines/groovie/saveload.cpp
diff --git a/engines/groovie/POTFILES b/engines/groovie/POTFILES
index 64f7e479d25..cc6a86340a4 100644
--- a/engines/groovie/POTFILES
+++ b/engines/groovie/POTFILES
@@ -1,3 +1,4 @@
engines/groovie/detection.cpp
engines/groovie/metaengine.cpp
+engines/groovie/saveload.cpp
engines/groovie/script.cpp
diff --git a/engines/groovie/logic/tlcgame.cpp b/engines/groovie/logic/tlcgame.cpp
index 148bd2d2e5e..54c3e86ff72 100644
--- a/engines/groovie/logic/tlcgame.cpp
+++ b/engines/groovie/logic/tlcgame.cpp
@@ -34,7 +34,6 @@
#include "common/events.h"
#include "common/file.h"
#include "common/macresman.h"
-#include "common/translation.h"
#include "common/util.h"
namespace Groovie {
diff --git a/engines/groovie/saveload.cpp b/engines/groovie/saveload.cpp
index 00ce89354c2..66ad2dd344a 100644
--- a/engines/groovie/saveload.cpp
+++ b/engines/groovie/saveload.cpp
@@ -49,7 +49,7 @@ SaveStateList SaveLoad::listValidSaves(const Common::String &target) {
SaveStateList list;
// some Groovie 2 games use save 0 with a garbage name for internal tracking, other games use slot 0 for Open House mode
- const Common::U32String reservedName = _("Reserved");
+ const Common::U32String reservedName = _("Reserved"); // I18N: Savegame default name in Groovie engine
bool hasReserved = false;
// Get the list of savefiles
Commit: 1373c48d357ecda80bb5d32da384b388fd7f86f2
https://github.com/scummvm/scummvm/commit/1373c48d357ecda80bb5d32da384b388fd7f86f2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T16:14:22+01:00
Commit Message:
HPL1: Add missing POTFILES
Changed paths:
A engines/hpl1/POTFILES
diff --git a/engines/hpl1/POTFILES b/engines/hpl1/POTFILES
new file mode 100644
index 00000000000..6e3324da3d0
--- /dev/null
+++ b/engines/hpl1/POTFILES
@@ -0,0 +1 @@
+engines/hpl1/metaengine.cpp
Commit: edbb112a5646c980c20198a8c995c383d797d1fe
https://github.com/scummvm/scummvm/commit/edbb112a5646c980c20198a8c995c383d797d1fe
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T16:17:46+01:00
Commit Message:
ICB: Add missing POTFILES
Changed paths:
A engines/icb/POTFILES
diff --git a/engines/icb/POTFILES b/engines/icb/POTFILES
new file mode 100644
index 00000000000..1b37462170d
--- /dev/null
+++ b/engines/icb/POTFILES
@@ -0,0 +1 @@
+engines/icb/icb.cpp
Commit: c5d49620b3bf74c249a38271abf4c5479df1dc9b
https://github.com/scummvm/scummvm/commit/c5d49620b3bf74c249a38271abf4c5479df1dc9b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T16:19:18+01:00
Commit Message:
ICB: Added I18N comments to keybindings
Changed paths:
engines/icb/icb.cpp
diff --git a/engines/icb/icb.cpp b/engines/icb/icb.cpp
index d788b5632c5..eee231610d9 100644
--- a/engines/icb/icb.cpp
+++ b/engines/icb/icb.cpp
@@ -85,47 +85,47 @@ Common::KeymapArray IcbEngine::initKeymapsIcb(const char *target) {
act->addDefaultInputMapping("JOY_RIGHT");
engineKeyMap->addAction(act);
- act = new Action("BFIR", _("Fire"));
+ act = new Action("BFIR", _("Fire")); // I18N: Action in ICB
act->setKeyEvent(KeyState(KEYCODE_SPACE));
act->addDefaultInputMapping("JOY_RIGHT_SHOULDER");
engineKeyMap->addAction(act);
- act = new Action("BUSE", _("Interact"));
+ act = new Action("BUSE", _("Interact")); // I18N: Action in ICB
act->setKeyEvent(KeyState(KEYCODE_LCTRL));
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Action("BINV", _("Inventory"));
+ act = new Action("BINV", _("Inventory")); // I18N: Action in ICB
act->setKeyEvent(KeyState(KEYCODE_RETURN));
act->addDefaultInputMapping("JOY_B");
engineKeyMap->addAction(act);
- act = new Action("BARM", _("Arm"));
+ act = new Action("BARM", _("Arm")); // I18N: Action in ICB
act->setKeyEvent(KeyState(KEYCODE_LALT));
act->addDefaultInputMapping("JOY_LEFT_SHOULDER");
engineKeyMap->addAction(act);
- act = new Action("BREM", _("Remora"));
+ act = new Action("BREM", _("Remora")); // I18N: Action in ICB
act->setKeyEvent(KeyState(KEYCODE_r));
act->addDefaultInputMapping("JOY_X");
engineKeyMap->addAction(act);
- act = new Action("BCRU", _("Crouch"));
+ act = new Action("BCRU", _("Crouch")); // I18N: Action in ICB
act->setKeyEvent(KeyState(KEYCODE_x));
act->addDefaultInputMapping("JOY_Y");
engineKeyMap->addAction(act);
- act = new Action("BSID", _("Side Step"));
+ act = new Action("BSID", _("Side Step")); // I18N: Action in ICB
act->setKeyEvent(KeyState(KEYCODE_LSHIFT));
act->addDefaultInputMapping("JOY_RIGHT_TRIGGER");
engineKeyMap->addAction(act);
- act = new Action("BRUN", _("Run"));
+ act = new Action("BRUN", _("Run")); // I18N: Action in ICB
act->setKeyEvent(KeyState(KEYCODE_z));
act->addDefaultInputMapping("JOY_LEFT_TRIGGER");
engineKeyMap->addAction(act);
- act = new Action("BPAS", _("Pause"));
+ act = new Action("BPAS", _("Pause")); // I18N: Action in ICB
act->setKeyEvent(KeyState(KEYCODE_ESCAPE, ASCII_ESCAPE));
act->addDefaultInputMapping("ESCAPE");
act->addDefaultInputMapping("JOY_BACK");
@@ -160,32 +160,32 @@ Common::KeymapArray IcbEngine::initKeymapsEldorado(const char *target) {
act->addDefaultInputMapping("JOY_RIGHT");
engineKeyMap->addAction(act);
- act = new Action("BUSE", _("Interact"));
+ act = new Action("BUSE", _("Interact")); // I18N: Action in ICB
act->setKeyEvent(KeyState(KEYCODE_LCTRL));
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Action("BINV", _("Inventory"));
+ act = new Action("BINV", _("Inventory")); // I18N: Action in ICB
act->setKeyEvent(KeyState(KEYCODE_RETURN));
act->addDefaultInputMapping("JOY_B");
engineKeyMap->addAction(act);
- act = new Action("BCRU", _("Crouch"));
+ act = new Action("BCRU", _("Crouch")); // I18N: Action in ICB
act->setKeyEvent(KeyState(KEYCODE_x));
act->addDefaultInputMapping("JOY_Y");
engineKeyMap->addAction(act);
- act = new Action("BSID", _("Side Step"));
+ act = new Action("BSID", _("Side Step")); // I18N: Action in ICB
act->setKeyEvent(KeyState(KEYCODE_LSHIFT));
act->addDefaultInputMapping("JOY_RIGHT_TRIGGER");
engineKeyMap->addAction(act);
- act = new Action("BRUN", _("Run"));
+ act = new Action("BRUN", _("Run")); // I18N: Action in ICB
act->setKeyEvent(KeyState(KEYCODE_z));
act->addDefaultInputMapping("JOY_LEFT_TRIGGER");
engineKeyMap->addAction(act);
- act = new Action("BPAS", _("Pause"));
+ act = new Action("BPAS", _("Pause")); // I18N: Action in ICB
act->setKeyEvent(KeyState(KEYCODE_ESCAPE, ASCII_ESCAPE));
act->addDefaultInputMapping("ESCAPE");
act->addDefaultInputMapping("JOY_BACK");
Commit: 555974a58462d69a8cc2467f262af73324662be4
https://github.com/scummvm/scummvm/commit/555974a58462d69a8cc2467f262af73324662be4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T16:20:44+01:00
Commit Message:
KYRA: Fix POTFILES
Changed paths:
engines/kyra/POTFILES
engines/kyra/detection.cpp
engines/kyra/detection_tables.h
diff --git a/engines/kyra/POTFILES b/engines/kyra/POTFILES
index bde948ef85a..8a7efab78aa 100644
--- a/engines/kyra/POTFILES
+++ b/engines/kyra/POTFILES
@@ -1,4 +1,3 @@
-engines/kyra/detection.cpp
engines/kyra/detection_tables.h
engines/kyra/metaengine.cpp
engines/kyra/engine/eobcommon.cpp
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 77873b9c991..6ef2036d58c 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -19,7 +19,6 @@
*
*/
-#include "common/translation.h"
#include "engines/advancedDetector.h"
#include "base/plugins.h"
diff --git a/engines/kyra/detection_tables.h b/engines/kyra/detection_tables.h
index d31d9dc6d1b..ccf72d78542 100644
--- a/engines/kyra/detection_tables.h
+++ b/engines/kyra/detection_tables.h
@@ -19,6 +19,8 @@
*
*/
+#include "common/translation.h"
+
namespace {
#define FLAGS(x, y, z, a, b, c, d, e, f, id) { Common::UNK_LANG, Common::UNK_LANG, Common::UNK_LANG, Common::UNK_LANG, Common::kPlatformUnknown, x, y, z, a, b, c, d, e, f, id }
Commit: 7c6e369ba32ed4d2201d64a17bcf75e5bab333a4
https://github.com/scummvm/scummvm/commit/7c6e369ba32ed4d2201d64a17bcf75e5bab333a4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T16:21:52+01:00
Commit Message:
MADE: Fix POTFILES
Changed paths:
engines/made/POTFILES
diff --git a/engines/made/POTFILES b/engines/made/POTFILES
index 6406996a3c9..3b8ac9e6b65 100644
--- a/engines/made/POTFILES
+++ b/engines/made/POTFILES
@@ -1,3 +1,2 @@
-engines/made/detection.cpp
engines/made/detection_tables.h
engines/made/metaengine.cpp
Commit: fdb2c1950e5ea62671391cd5d6a84a507e0cfd72
https://github.com/scummvm/scummvm/commit/fdb2c1950e5ea62671391cd5d6a84a507e0cfd72
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T16:24:25+01:00
Commit Message:
DEVTOOLS: Added checks for POTFILES usage
Changed paths:
devtools/release-checks.sh
diff --git a/devtools/release-checks.sh b/devtools/release-checks.sh
index 7b88d9b43dd..46886f6cc25 100755
--- a/devtools/release-checks.sh
+++ b/devtools/release-checks.sh
@@ -231,11 +231,68 @@ else
echoOk
fi
-#############################################################################
-#
-# Engines go here
-#
-#############################################################################
+##########
+# POTFILES
+##########
+
+echo_n "Checking POTFILES duplicates..."
+
+OLDIFS="$IFS"
+IFS=$'\n' # allow arguments with tabs and spaces
+
+# First, assemble all the files
+
+list=`cat po/POTFILES engines/*/POTFILES | sed '/^$/d' | sort`
+
+dupes=`uniq -c <<<"$list" | grep -v "1 "`
+
+if [ ! -z "$dupes" ]; then
+ num_lines=`wc -l <<< "$dupes"`
+ echo -e "$num_lines dupes detected"
+
+ echo $dupes
+
+ failPlus
+else
+ echoOk
+fi
+
+echo_n "Checking POTFILES header includes..."
+
+headerlist=`grep \.h$ <<< "$list" | grep -v detection_ | grep -v keymapper_`
+
+if [ ! -z "$headerlist" ]; then
+ num_lines=`wc -l <<< "$headerlist"`
+ echo -e "$num_lines headers detected"
+
+ echo "$headerlist"
+
+ failPlus
+else
+ echoOk
+fi
+
+
+echo_n "Checking missing/extra POTFILES..."
+
+# Now get list of includes
+git grep -l "common/translation\.h" | grep -v devtools/create_engine | sort > $TMP
+
+res=`diff - $TMP <<< "$list"`
+
+if [ ! -z "$res" ]; then
+ echo -e "${RED}Failed.${NC}"
+ echo "The diff is below. < marks extra files in POTFILES, > marks missing file in POTFILES"
+
+ echo "$res"
+
+ failPlus
+else
+ echoOk
+fi
+
+
+IFS="$OLDIFS"
##########
# Dat files
@@ -334,6 +391,12 @@ else
fi
+#############################################################################
+#
+# Engines go here
+#
+#############################################################################
+
###########
# MM engine
###########
More information about the Scummvm-git-logs
mailing list