[Scummvm-cvs-logs] scummvm master -> b166cb84e2b57714c1817d4e69e98acd2cd455b6
lordhoto
lordhoto at gmail.com
Thu Jan 21 23:50:31 CET 2016
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
1479219f7a COMMON: Add render modes for Apple IIgs and Atari ST.
0024519e9c COMMON: Use our standard FM-TOWNS spelling for render modes.
a481702488 COMMON: Allow translation of PC-98 render modes.
ee3e40abc1 I18N: Update scummvm.pot.
29ade784e4 AGI: Give a nicer error message on invalid render mode.
b166cb84e2 COMMON: Use spaces for beautifying formatting.
Commit: 1479219f7a30ee95f2a9d79310566d930f8f3de6
https://github.com/scummvm/scummvm/commit/1479219f7a30ee95f2a9d79310566d930f8f3de6
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-21T23:41:30+01:00
Commit Message:
COMMON: Add render modes for Apple IIgs and Atari ST.
On request of m_kiewitz who wants to use it for AGI.
Changed paths:
README
base/commandLine.cpp
common/gui_options.cpp
common/gui_options.h
common/rendermode.cpp
common/rendermode.h
diff --git a/README b/README
index a34856c..e94cb86 100644
--- a/README
+++ b/README
@@ -1168,8 +1168,9 @@ arguments -- see the next section.
--output-rate=RATE Select output sample rate in Hz (e.g. 22050)
--opl-driver=DRIVER Select AdLib (OPL) emulator (db, mame)
--aspect-ratio Enable aspect ratio correction
- --render-mode=MODE Enable additional render modes (cga, ega, hercGreen,
- hercAmber, amiga)
+ --render-mode=MODE Enable additional render modes (hercGreen, hercAmber,
+ cga, ega, vga, amiga, fmtowns, pc9821, pc9801, 2gs,
+ atari)
--alt-intro Use alternative intro for CD versions of Beneath a
Steel Sky and Flight of the Amazon Queen
diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 285fd63..783af47 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -116,8 +116,9 @@ static const char HELP_STRING[] =
" --output-rate=RATE Select output sample rate in Hz (e.g. 22050)\n"
" --opl-driver=DRIVER Select AdLib (OPL) emulator (db, mame)\n"
" --aspect-ratio Enable aspect ratio correction\n"
- " --render-mode=MODE Enable additional render modes (cga, ega, hercGreen,\n"
- " hercAmber, amiga)\n"
+ " --render-mode=MODE Enable additional render modes (hercGreen, hercAmber,\n"
+ " cga, ega, vga, amiga, fmtowns, pc9821, pc9801, 2gs,\n"
+ " atari)\n"
#ifdef ENABLE_EVENTRECORDER
" --record-mode=MODE Specify record mode for event recorder (record, playback,\n"
" passthrough [default])\n"
diff --git a/common/gui_options.cpp b/common/gui_options.cpp
index d79bf1b..ab5a132 100644
--- a/common/gui_options.cpp
+++ b/common/gui_options.cpp
@@ -62,6 +62,8 @@ const struct GameOpt {
{ GUIO_RENDERFMTOWNS, "fmtowns" },
{ GUIO_RENDERPC9821, "pc9821" },
{ GUIO_RENDERPC9801, "pc9801" },
+ { GUIO_RENDERAPPLE2GS, "2gs" },
+ { GUIO_RENDERATARIST, "atari" },
{ GUIO_GAMEOPTIONS1, "gameOption1" },
{ GUIO_GAMEOPTIONS2, "gameOption2" },
diff --git a/common/gui_options.h b/common/gui_options.h
index 78e9cc7..b608fa3 100644
--- a/common/gui_options.h
+++ b/common/gui_options.h
@@ -54,16 +54,18 @@
#define GUIO_RENDERFMTOWNS "\036"
#define GUIO_RENDERPC9821 "\037"
#define GUIO_RENDERPC9801 "\040"
+#define GUIO_RENDERAPPLE2GS "\041"
+#define GUIO_RENDERATARIST "\042"
// Special GUIO flags for the AdvancedDetector's caching of game specific
// options.
-#define GUIO_GAMEOPTIONS1 "\041"
-#define GUIO_GAMEOPTIONS2 "\042"
-#define GUIO_GAMEOPTIONS3 "\043"
-#define GUIO_GAMEOPTIONS4 "\044"
-#define GUIO_GAMEOPTIONS5 "\045"
-#define GUIO_GAMEOPTIONS6 "\046"
-#define GUIO_GAMEOPTIONS7 "\047"
+#define GUIO_GAMEOPTIONS1 "\050"
+#define GUIO_GAMEOPTIONS2 "\051"
+#define GUIO_GAMEOPTIONS3 "\052"
+#define GUIO_GAMEOPTIONS4 "\053"
+#define GUIO_GAMEOPTIONS5 "\054"
+#define GUIO_GAMEOPTIONS6 "\055"
+#define GUIO_GAMEOPTIONS7 "\056"
#define GUIO0() (GUIO_NONE)
#define GUIO1(a) (a)
diff --git a/common/rendermode.cpp b/common/rendermode.cpp
index 6115666..9ee4732 100644
--- a/common/rendermode.cpp
+++ b/common/rendermode.cpp
@@ -41,6 +41,8 @@ const RenderModeDescription g_renderModes[] = {
{ "fmtowns", "FM-Towns", kRenderFMTowns },
{ "pc9821", "PC-9821 (256 Colors)", kRenderPC9821 },
{ "pc9801", "PC-9801 (16 Colors)", kRenderPC9801 },
+ { "2gs", "Apple IIgs", kRenderApple2GS },
+ { "atari", "Atari ST", kRenderAtariST },
{0, 0, kRenderDefault}
};
@@ -61,7 +63,9 @@ static const RenderGUIOMapping s_renderGUIOMapping[] = {
{ kRenderAmiga, GUIO_RENDERAMIGA },
{ kRenderFMTowns, GUIO_RENDERFMTOWNS },
{ kRenderPC9821, GUIO_RENDERPC9821 },
- { kRenderPC9801, GUIO_RENDERPC9801 }
+ { kRenderPC9801, GUIO_RENDERPC9801 },
+ { kRenderApple2GS, GUIO_RENDERAPPLE2GS },
+ { kRenderAtariST, GUIO_RENDERATARIST }
};
DECLARE_TRANSLATION_ADDITIONAL_CONTEXT("Hercules Green", "lowres")
diff --git a/common/rendermode.h b/common/rendermode.h
index 59fa860..49dfaab 100644
--- a/common/rendermode.h
+++ b/common/rendermode.h
@@ -45,7 +45,9 @@ enum RenderMode {
kRenderAmiga = 6,
kRenderFMTowns = 7,
kRenderPC9821 = 8,
- kRenderPC9801 = 9
+ kRenderPC9801 = 9,
+ kRenderApple2GS = 10,
+ kRenderAtariST = 11
};
struct RenderModeDescription {
Commit: 0024519e9c8e16544e9da06c76a41051e70db3d5
https://github.com/scummvm/scummvm/commit/0024519e9c8e16544e9da06c76a41051e70db3d5
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-21T23:41:30+01:00
Commit Message:
COMMON: Use our standard FM-TOWNS spelling for render modes.
Changed paths:
common/rendermode.cpp
diff --git a/common/rendermode.cpp b/common/rendermode.cpp
index 9ee4732..31fe162 100644
--- a/common/rendermode.cpp
+++ b/common/rendermode.cpp
@@ -38,7 +38,7 @@ const RenderModeDescription g_renderModes[] = {
{ "ega", "EGA", kRenderEGA },
{ "vga", "VGA", kRenderVGA },
{ "amiga", "Amiga", kRenderAmiga },
- { "fmtowns", "FM-Towns", kRenderFMTowns },
+ { "fmtowns", "FM-TOWNS", kRenderFMTowns },
{ "pc9821", "PC-9821 (256 Colors)", kRenderPC9821 },
{ "pc9801", "PC-9801 (16 Colors)", kRenderPC9801 },
{ "2gs", "Apple IIgs", kRenderApple2GS },
Commit: a4817024880d05edf9c2c3f6c945d73b876a753e
https://github.com/scummvm/scummvm/commit/a4817024880d05edf9c2c3f6c945d73b876a753e
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-21T23:41:30+01:00
Commit Message:
COMMON: Allow translation of PC-98 render modes.
Changed paths:
common/rendermode.cpp
diff --git a/common/rendermode.cpp b/common/rendermode.cpp
index 31fe162..48a1932 100644
--- a/common/rendermode.cpp
+++ b/common/rendermode.cpp
@@ -39,8 +39,8 @@ const RenderModeDescription g_renderModes[] = {
{ "vga", "VGA", kRenderVGA },
{ "amiga", "Amiga", kRenderAmiga },
{ "fmtowns", "FM-TOWNS", kRenderFMTowns },
- { "pc9821", "PC-9821 (256 Colors)", kRenderPC9821 },
- { "pc9801", "PC-9801 (16 Colors)", kRenderPC9801 },
+ { "pc9821", _s("PC-9821 (256 Colors)"), kRenderPC9821 },
+ { "pc9801", _s("PC-9801 (16 Colors)"), kRenderPC9801 },
{ "2gs", "Apple IIgs", kRenderApple2GS },
{ "atari", "Atari ST", kRenderAtariST },
{0, 0, kRenderDefault}
Commit: ee3e40abc18acd685bb15832fca8f49fc0150b22
https://github.com/scummvm/scummvm/commit/ee3e40abc18acd685bb15832fca8f49fc0150b22
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-21T23:41:30+01:00
Commit Message:
I18N: Update scummvm.pot.
Changed paths:
po/scummvm.pot
diff --git a/po/scummvm.pot b/po/scummvm.pot
index 0445534..b6d29a6 100644
--- a/po/scummvm.pot
+++ b/po/scummvm.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.8.0git\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2015-12-23 00:28+0000\n"
+"POT-Creation-Date: 2016-01-21 23:30+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -57,12 +57,12 @@ msgstr ""
#: gui/recorderdialog.cpp:70 gui/recorderdialog.cpp:156
#: gui/saveload-dialog.cpp:216 gui/saveload-dialog.cpp:276
#: gui/saveload-dialog.cpp:547 gui/saveload-dialog.cpp:931
-#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152
-#: engines/engine.cpp:483 backends/platform/wii/options.cpp:48
+#: gui/themebrowser.cpp:55 gui/fluidsynth-dialog.cpp:152 engines/engine.cpp:546
+#: backends/platform/wii/options.cpp:48
#: backends/events/default/default-events.cpp:196
-#: backends/events/default/default-events.cpp:218
-#: engines/drascula/saveload.cpp:49 engines/parallaction/saveload.cpp:274
-#: engines/scumm/dialogs.cpp:191 engines/sword1/control.cpp:865
+#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:191
+#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:274
+#: engines/drascula/saveload.cpp:49
msgid "Cancel"
msgstr ""
@@ -99,8 +99,8 @@ msgstr ""
msgid "Do you really want to overwrite the file?"
msgstr ""
-#: gui/filebrowser-dialog.cpp:132 gui/launcher.cpp:793 gui/launcher.cpp:941
-#: gui/launcher.cpp:1000 gui/fluidsynth-dialog.cpp:217
+#: gui/filebrowser-dialog.cpp:132 gui/launcher.cpp:795 gui/launcher.cpp:943
+#: gui/launcher.cpp:1002 gui/fluidsynth-dialog.cpp:217
#: backends/events/symbiansdl/symbiansdl-events.cpp:186
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -109,8 +109,8 @@ msgstr ""
msgid "Yes"
msgstr ""
-#: gui/filebrowser-dialog.cpp:132 gui/launcher.cpp:793 gui/launcher.cpp:941
-#: gui/launcher.cpp:1000 gui/fluidsynth-dialog.cpp:217
+#: gui/filebrowser-dialog.cpp:132 gui/launcher.cpp:795 gui/launcher.cpp:943
+#: gui/launcher.cpp:1002 gui/fluidsynth-dialog.cpp:217
#: backends/events/symbiansdl/symbiansdl-events.cpp:186
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -119,26 +119,26 @@ msgstr ""
msgid "No"
msgstr ""
-#: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53
+#: gui/gui-manager.cpp:119 backends/keymapper/remap-dialog.cpp:53
#: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141
#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:192
#: engines/scumm/help.cpp:210
msgid "Close"
msgstr ""
-#: gui/gui-manager.cpp:120
+#: gui/gui-manager.cpp:122
msgid "Mouse click"
msgstr ""
-#: gui/gui-manager.cpp:124 base/main.cpp:319
+#: gui/gui-manager.cpp:126 base/main.cpp:322
msgid "Display keyboard"
msgstr ""
-#: gui/gui-manager.cpp:128 base/main.cpp:323
+#: gui/gui-manager.cpp:130 base/main.cpp:326
msgid "Remap keys"
msgstr ""
-#: gui/gui-manager.cpp:131 base/main.cpp:326 engines/scumm/help.cpp:87
+#: gui/gui-manager.cpp:133 base/main.cpp:329 engines/scumm/help.cpp:87
msgid "Toggle fullscreen"
msgstr ""
@@ -150,23 +150,22 @@ msgstr ""
msgid "Map"
msgstr ""
-#: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1048
-#: gui/launcher.cpp:1052 gui/massadd.cpp:92 gui/options.cpp:1238
+#: gui/KeysDialog.cpp:42 gui/launcher.cpp:352 gui/launcher.cpp:1050
+#: gui/launcher.cpp:1054 gui/massadd.cpp:92 gui/options.cpp:1238
#: gui/saveload-dialog.cpp:932 gui/fluidsynth-dialog.cpp:153
-#: engines/engine.cpp:402 engines/engine.cpp:413
+#: engines/engine.cpp:465 engines/engine.cpp:476
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
-#: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49
-#: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274
-#: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1834
-#: engines/scumm/players/player_v3m.cpp:130
-#: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131
-#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:524
-#: engines/sword1/animation.cpp:545 engines/sword1/animation.cpp:561
-#: engines/sword1/animation.cpp:569 engines/sword1/control.cpp:865
-#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:425
-#: engines/sword2/animation.cpp:445 engines/sword2/animation.cpp:461
-#: engines/sword2/animation.cpp:471
+#: engines/agos/animation.cpp:558 engines/scumm/dialogs.cpp:193
+#: engines/scumm/scumm.cpp:1834 engines/scumm/players/player_v3m.cpp:130
+#: engines/scumm/players/player_v5m.cpp:108 engines/groovie/script.cpp:408
+#: engines/sky/compact.cpp:131 engines/sky/compact.cpp:141
+#: engines/sword2/animation.cpp:425 engines/sword2/animation.cpp:445
+#: engines/sword2/animation.cpp:461 engines/sword2/animation.cpp:471
+#: engines/sword1/animation.cpp:524 engines/sword1/animation.cpp:545
+#: engines/sword1/animation.cpp:561 engines/sword1/animation.cpp:569
+#: engines/sword1/control.cpp:865 engines/sword1/logic.cpp:1633
+#: engines/parallaction/saveload.cpp:274 engines/drascula/saveload.cpp:49
msgid "OK"
msgstr ""
@@ -491,64 +490,64 @@ msgstr ""
msgid "Search in game list"
msgstr ""
-#: gui/launcher.cpp:661 gui/launcher.cpp:1222
+#: gui/launcher.cpp:661 gui/launcher.cpp:1224
msgid "Search:"
msgstr ""
#: gui/launcher.cpp:685 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718
#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600
+#: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718
msgid "Load game:"
msgstr ""
#: gui/launcher.cpp:685 engines/dialogs.cpp:115
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/myst.cpp:245
-#: engines/mohawk/riven.cpp:718 engines/pegasus/pegasus.cpp:353
-#: engines/scumm/dialogs.cpp:189 engines/tsage/scenes.cpp:600
+#: engines/scumm/dialogs.cpp:189 engines/cruise/menu.cpp:214
+#: engines/pegasus/pegasus.cpp:353 engines/tsage/scenes.cpp:600
+#: engines/mohawk/myst.cpp:245 engines/mohawk/riven.cpp:718
msgid "Load"
msgstr ""
-#: gui/launcher.cpp:792
+#: gui/launcher.cpp:794
msgid ""
"Do you really want to run the mass game detector? This could potentially add "
"a huge number of games."
msgstr ""
-#: gui/launcher.cpp:841
+#: gui/launcher.cpp:843
msgid "ScummVM couldn't open the specified directory!"
msgstr ""
-#: gui/launcher.cpp:853
+#: gui/launcher.cpp:855
msgid "ScummVM could not find any game in the specified directory!"
msgstr ""
-#: gui/launcher.cpp:867
+#: gui/launcher.cpp:869
msgid "Pick the game:"
msgstr ""
-#: gui/launcher.cpp:941
+#: gui/launcher.cpp:943
msgid "Do you really want to remove this game configuration?"
msgstr ""
-#: gui/launcher.cpp:999
+#: gui/launcher.cpp:1001
msgid "Do you want to load saved game?"
msgstr ""
-#: gui/launcher.cpp:1048
+#: gui/launcher.cpp:1050
msgid "This game does not support loading games from the launcher."
msgstr ""
-#: gui/launcher.cpp:1052
+#: gui/launcher.cpp:1054
msgid "ScummVM could not find any engine capable of running the selected game!"
msgstr ""
-#: gui/launcher.cpp:1159
+#: gui/launcher.cpp:1161
msgid "Mass Add..."
msgstr ""
-#: gui/launcher.cpp:1161
+#: gui/launcher.cpp:1163
msgid "Record..."
msgstr ""
@@ -1216,35 +1215,35 @@ msgid ""
"Do you really want to reset all FluidSynth settings to their default values?"
msgstr ""
-#: base/main.cpp:228
+#: base/main.cpp:237
#, c-format
msgid "Engine does not support debug level '%s'"
msgstr ""
-#: base/main.cpp:306
+#: base/main.cpp:309
msgid "Menu"
msgstr ""
-#: base/main.cpp:309 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:45
#: backends/platform/wince/CEActionsPocket.cpp:45
#: backends/platform/wince/CEActionsSmartphone.cpp:46
msgid "Skip"
msgstr ""
-#: base/main.cpp:312 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:315 backends/platform/symbian/src/SymbianActions.cpp:50
#: backends/platform/wince/CEActionsPocket.cpp:42
msgid "Pause"
msgstr ""
-#: base/main.cpp:315
+#: base/main.cpp:318
msgid "Skip line"
msgstr ""
-#: base/main.cpp:507
+#: base/main.cpp:510
msgid "Error running game:"
msgstr ""
-#: base/main.cpp:554
+#: base/main.cpp:557
msgid "Could not find any engine capable of running the selected game"
msgstr ""
@@ -1358,11 +1357,11 @@ msgctxt "lowres"
msgid "~R~eturn to Launcher"
msgstr ""
-#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803
-#: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336
-#: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:877
-#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:759
-#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598
+#: engines/dialogs.cpp:116 engines/dreamweb/saveload.cpp:261
+#: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212
+#: engines/pegasus/pegasus.cpp:377 engines/tsage/scenes.cpp:598
+#: engines/sci/engine/kfile.cpp:769 engines/toltecs/menu.cpp:281
+#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:877
msgid "Save game:"
msgstr ""
@@ -1371,11 +1370,11 @@ msgstr ""
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:45
#: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212
-#: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261
-#: engines/neverhood/menumodule.cpp:877 engines/pegasus/pegasus.cpp:377
-#: engines/sci/engine/kfile.cpp:759 engines/scumm/dialogs.cpp:188
-#: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598
+#: engines/dreamweb/saveload.cpp:261 engines/agi/saveload.cpp:803
+#: engines/scumm/dialogs.cpp:188 engines/cruise/menu.cpp:212
+#: engines/pegasus/pegasus.cpp:377 engines/tsage/scenes.cpp:598
+#: engines/sci/engine/kfile.cpp:769 engines/toltecs/menu.cpp:281
+#: engines/drascula/saveload.cpp:336 engines/neverhood/menumodule.cpp:877
msgid "Save"
msgstr ""
@@ -1393,13 +1392,13 @@ msgid ""
"and for instructions on how to obtain further assistance."
msgstr ""
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:109
-#: engines/mohawk/dialogs.cpp:170 engines/tsage/dialogs.cpp:106
+#: engines/dialogs.cpp:307 engines/tsage/dialogs.cpp:106
+#: engines/mohawk/dialogs.cpp:109 engines/mohawk/dialogs.cpp:170
msgid "~O~K"
msgstr ""
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:110
-#: engines/mohawk/dialogs.cpp:171 engines/tsage/dialogs.cpp:107
+#: engines/dialogs.cpp:308 engines/tsage/dialogs.cpp:107
+#: engines/mohawk/dialogs.cpp:110 engines/mohawk/dialogs.cpp:171
msgid "~C~ancel"
msgstr ""
@@ -1407,23 +1406,23 @@ msgstr ""
msgid "~K~eys"
msgstr ""
-#: engines/engine.cpp:276
+#: engines/engine.cpp:339
msgid "Could not initialize color format."
msgstr ""
-#: engines/engine.cpp:284
+#: engines/engine.cpp:347
msgid "Could not switch to video mode: '"
msgstr ""
-#: engines/engine.cpp:293
+#: engines/engine.cpp:356
msgid "Could not apply aspect ratio setting."
msgstr ""
-#: engines/engine.cpp:298
+#: engines/engine.cpp:361
msgid "Could not apply fullscreen setting."
msgstr ""
-#: engines/engine.cpp:398
+#: engines/engine.cpp:461
msgid ""
"You appear to be playing this game directly\n"
"from the CD. This is known to cause problems,\n"
@@ -1432,7 +1431,7 @@ msgid ""
"See the README file for details."
msgstr ""
-#: engines/engine.cpp:409
+#: engines/engine.cpp:472
msgid ""
"This game has audio tracks in its disk. These\n"
"tracks need to be ripped from the disk using\n"
@@ -1441,21 +1440,21 @@ msgid ""
"See the README file for details."
msgstr ""
-#: engines/engine.cpp:467
+#: engines/engine.cpp:530
#, c-format
msgid ""
"Gamestate load failed (%s)! Please consult the README for basic information, "
"and for instructions on how to obtain further assistance."
msgstr ""
-#: engines/engine.cpp:480
+#: engines/engine.cpp:543
msgid ""
"WARNING: The game you are about to start is not yet fully supported by "
"ScummVM. As such, it is likely to be unstable, and any saves you make might "
"not work in future versions of ScummVM."
msgstr ""
-#: engines/engine.cpp:483
+#: engines/engine.cpp:546
msgid "Start anyway"
msgstr ""
@@ -1784,9 +1783,8 @@ msgstr ""
#: backends/platform/symbian/src/SymbianActions.cpp:52
#: backends/platform/wince/CEActionsPocket.cpp:44
#: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: backends/events/default/default-events.cpp:218
-#: engines/scumm/dialogs.cpp:192 engines/scumm/help.cpp:83
-#: engines/scumm/help.cpp:85
+#: backends/events/default/default-events.cpp:218 engines/scumm/dialogs.cpp:192
+#: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
msgid "Quit"
msgstr ""
@@ -2137,48 +2135,46 @@ msgstr ""
msgid "Clicking Disabled"
msgstr ""
-#: engines/agi/detection.cpp:147 engines/drascula/detection.cpp:302
-#: engines/dreamweb/detection.cpp:47 engines/neverhood/detection.cpp:160
+#: engines/dreamweb/detection.cpp:47 engines/agi/detection.cpp:147
#: engines/sci/detection.cpp:394 engines/toltecs/detection.cpp:200
-#: engines/zvision/detection_tables.h:51
+#: engines/zvision/detection_tables.h:51 engines/drascula/detection.cpp:302
+#: engines/neverhood/detection.cpp:160 engines/cine/detection.cpp:70
msgid "Use original save/load screens"
msgstr ""
-#: engines/agi/detection.cpp:148 engines/drascula/detection.cpp:303
-#: engines/dreamweb/detection.cpp:48 engines/neverhood/detection.cpp:161
+#: engines/dreamweb/detection.cpp:48 engines/agi/detection.cpp:148
#: engines/sci/detection.cpp:395 engines/toltecs/detection.cpp:201
+#: engines/drascula/detection.cpp:303 engines/neverhood/detection.cpp:161
+#: engines/cine/detection.cpp:71
msgid "Use the original save/load screens, instead of the ScummVM ones"
msgstr ""
-#: engines/agi/detection.cpp:157
-msgid "Use an alternative palette"
+#: engines/dreamweb/detection.cpp:57
+msgid "Use bright palette mode"
msgstr ""
-#: engines/agi/detection.cpp:158
-msgid ""
-"Use an alternative palette, common for all Amiga games. This was the old "
-"behavior"
+#: engines/dreamweb/detection.cpp:58
+msgid "Display graphics using the game's bright palette"
msgstr ""
-#: engines/agi/detection.cpp:167
-msgid "Mouse support"
+#: engines/dreamweb/saveload.cpp:169 engines/agi/saveload.cpp:816
+#: engines/sci/engine/kfile.cpp:868 engines/toltecs/menu.cpp:256
+#: engines/drascula/saveload.cpp:349 engines/neverhood/menumodule.cpp:890
+msgid "Restore game:"
msgstr ""
-#: engines/agi/detection.cpp:168
-msgid ""
-"Enables mouse support. Allows to use mouse for movement and in game menus."
+#: engines/dreamweb/saveload.cpp:169 engines/agi/saveload.cpp:816
+#: engines/sci/engine/kfile.cpp:868 engines/toltecs/menu.cpp:256
+#: engines/drascula/saveload.cpp:349 engines/neverhood/menumodule.cpp:890
+msgid "Restore"
msgstr ""
-#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349
-#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:890
-#: engines/sci/engine/kfile.cpp:858 engines/toltecs/menu.cpp:256
-msgid "Restore game:"
+#: engines/queen/detection.cpp:56
+msgid "Alternative intro"
msgstr ""
-#: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349
-#: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:890
-#: engines/sci/engine/kfile.cpp:858 engines/toltecs/menu.cpp:256
-msgid "Restore"
+#: engines/queen/detection.cpp:57
+msgid "Use an alternative game intro (CD version only)"
msgstr ""
#: engines/agos/saveload.cpp:160 engines/scumm/scumm.cpp:2377
@@ -2210,1210 +2206,1213 @@ msgstr ""
msgid "Cutscene file '%s' not found!"
msgstr ""
-#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:101
-msgid "Color Blind Mode"
-msgstr ""
-
-#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:102
-msgid "Enable Color Blind Mode by default"
+#: engines/agi/detection.cpp:157
+msgid "Use an alternative palette"
msgstr ""
-#: engines/drascula/saveload.cpp:47
+#: engines/agi/detection.cpp:158
msgid ""
-"ScummVM found that you have old savefiles for Drascula that should be "
-"converted.\n"
-"The old save game format is no longer supported, so you will not be able to "
-"load your games if you don't convert them.\n"
-"\n"
-"Press OK to convert them now, otherwise you will be asked again the next "
-"time you start the game.\n"
+"Use an alternative palette, common for all Amiga games. This was the old "
+"behavior"
msgstr ""
-#: engines/dreamweb/detection.cpp:57
-msgid "Use bright palette mode"
+#: engines/agi/detection.cpp:167
+msgid "Mouse support"
msgstr ""
-#: engines/dreamweb/detection.cpp:58
-msgid "Display graphics using the game's bright palette"
+#: engines/agi/detection.cpp:168
+msgid ""
+"Enables mouse support. Allows to use mouse for movement and in game menus."
msgstr ""
-#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1470
-#: engines/gob/inter_geisha.cpp:232 engines/tinsel/saveload.cpp:532
-msgid "Failed to load game state from file."
+#: engines/scumm/dialogs.cpp:176
+#, c-format
+msgid "Insert Disk %c and Press Button to Continue."
msgstr ""
-#: engines/gob/inter_v2.cpp:1540 engines/gob/inter_geisha.cpp:263
-#: engines/tinsel/saveload.cpp:545
-msgid "Failed to save game state to file."
+#: engines/scumm/dialogs.cpp:177
+#, c-format
+msgid "Unable to Find %s, (%c%d) Press Button."
msgstr ""
-#: engines/gob/inter_v5.cpp:107
-msgid "Failed to delete file."
+#: engines/scumm/dialogs.cpp:178
+#, c-format
+msgid "Error reading disk %c, (%c%d) Press Button."
msgstr ""
-#: engines/groovie/detection.cpp:312
-msgid "Fast movie speed"
+#: engines/scumm/dialogs.cpp:179
+msgid "Game Paused. Press SPACE to Continue."
msgstr ""
-#: engines/groovie/detection.cpp:313
-msgid "Play movies at an increased speed"
+#. I18N: You may specify 'Yes' symbol at the end of the line, like this:
+#. "Moechten Sie wirklich neu starten? (J/N)J"
+#. Will react to J as 'Yes'
+#: engines/scumm/dialogs.cpp:183
+msgid "Are you sure you want to restart? (Y/N)Y"
msgstr ""
-#: engines/groovie/script.cpp:408
-msgid "Failed to save game"
+#. I18N: you may specify 'Yes' symbol at the end of the line. See previous comment
+#: engines/scumm/dialogs.cpp:185
+msgid "Are you sure you want to quit? (Y/N)Y"
msgstr ""
-#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86
-msgid "Gore Mode"
+#: engines/scumm/dialogs.cpp:190
+msgid "Play"
msgstr ""
-#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87
-msgid "Enable Gore Mode when available"
+#: engines/scumm/dialogs.cpp:194
+msgid "Insert save/load game disk"
msgstr ""
-#. I18N: Studio audience adds an applause and cheering sounds whenever
-#. Malcolm makes a joke.
-#: engines/kyra/detection.cpp:62
-msgid "Studio audience"
+#: engines/scumm/dialogs.cpp:195
+msgid "You must enter a name"
msgstr ""
-#: engines/kyra/detection.cpp:63
-msgid "Enable studio audience"
+#: engines/scumm/dialogs.cpp:196
+msgid "The game was NOT saved (disk full?)"
msgstr ""
-#. I18N: This option allows the user to skip text and cutscenes.
-#: engines/kyra/detection.cpp:73
-msgid "Skip support"
+#: engines/scumm/dialogs.cpp:197
+msgid "The game was NOT loaded"
msgstr ""
-#: engines/kyra/detection.cpp:74
-msgid "Allow text and cutscenes to be skipped"
+#: engines/scumm/dialogs.cpp:198
+#, c-format
+msgid "Saving '%s'"
msgstr ""
-#. I18N: Helium mode makes people sound like they've inhaled Helium.
-#: engines/kyra/detection.cpp:84
-msgid "Helium mode"
+#: engines/scumm/dialogs.cpp:199
+#, c-format
+msgid "Loading '%s'"
msgstr ""
-#: engines/kyra/detection.cpp:85
-msgid "Enable helium mode"
+#: engines/scumm/dialogs.cpp:200
+msgid "Name your SAVE game"
msgstr ""
-#. I18N: When enabled, this option makes scrolling smoother when
-#. changing from one screen to another.
-#: engines/kyra/detection.cpp:99
-msgid "Smooth scrolling"
+#: engines/scumm/dialogs.cpp:201
+msgid "Select a game to LOAD"
msgstr ""
-#: engines/kyra/detection.cpp:100
-msgid "Enable smooth scrolling when walking"
+#: engines/scumm/dialogs.cpp:202
+msgid "Game title)"
msgstr ""
-#. I18N: When enabled, this option changes the cursor when it floats to the
-#. edge of the screen to a directional arrow. The player can then click to
-#. walk towards that direction.
-#: engines/kyra/detection.cpp:112
-msgid "Floating cursors"
+#. I18N: Previous page button
+#: engines/scumm/dialogs.cpp:288
+msgid "~P~revious"
msgstr ""
-#: engines/kyra/detection.cpp:113
-msgid "Enable floating cursors"
+#. I18N: Next page button
+#: engines/scumm/dialogs.cpp:290
+msgid "~N~ext"
msgstr ""
-#. I18N: HP stands for Hit Points
-#: engines/kyra/detection.cpp:127
-msgid "HP bar graphs"
+#: engines/scumm/dialogs.cpp:602
+msgid "Speech Only"
msgstr ""
-#: engines/kyra/detection.cpp:128
-msgid "Enable hit point bar graphs"
+#: engines/scumm/dialogs.cpp:603
+msgid "Speech and Subtitles"
msgstr ""
-#: engines/kyra/lol.cpp:478
-msgid "Attack 1"
+#: engines/scumm/dialogs.cpp:604
+msgid "Subtitles Only"
msgstr ""
-#: engines/kyra/lol.cpp:479
-msgid "Attack 2"
+#: engines/scumm/dialogs.cpp:612
+msgctxt "lowres"
+msgid "Speech & Subs"
msgstr ""
-#: engines/kyra/lol.cpp:480
-msgid "Attack 3"
+#: engines/scumm/dialogs.cpp:658
+msgid "Select a Proficiency Level."
msgstr ""
-#: engines/kyra/lol.cpp:481
-msgid "Move Forward"
+#: engines/scumm/dialogs.cpp:660
+msgid "Refer to your Loom(TM) manual for help."
msgstr ""
-#: engines/kyra/lol.cpp:482
-msgid "Move Back"
+#: engines/scumm/dialogs.cpp:664
+msgid "Practice"
msgstr ""
-#: engines/kyra/lol.cpp:483
-msgid "Slide Left"
+#: engines/scumm/dialogs.cpp:665
+msgid "Expert"
msgstr ""
-#: engines/kyra/lol.cpp:484
-msgid "Slide Right"
+#: engines/scumm/help.cpp:74
+msgid "Common keyboard commands:"
msgstr ""
-#: engines/kyra/lol.cpp:485 engines/pegasus/pegasus.cpp:2509
-msgid "Turn Left"
+#: engines/scumm/help.cpp:75
+msgid "Save / Load dialog"
msgstr ""
-#: engines/kyra/lol.cpp:486 engines/pegasus/pegasus.cpp:2510
-msgid "Turn Right"
+#: engines/scumm/help.cpp:77
+msgid "Skip line of text"
msgstr ""
-#: engines/kyra/lol.cpp:487
-msgid "Rest"
+#: engines/scumm/help.cpp:78
+msgid "Esc"
msgstr ""
-#: engines/kyra/lol.cpp:488
-msgid "Options"
+#: engines/scumm/help.cpp:78
+msgid "Skip cutscene"
msgstr ""
-#: engines/kyra/lol.cpp:489
-msgid "Choose Spell"
+#: engines/scumm/help.cpp:79
+msgid "Space"
msgstr ""
-#: engines/kyra/sound_midi.cpp:477
-msgid ""
-"You appear to be using a General MIDI device,\n"
-"but your game only supports Roland MT32 MIDI.\n"
-"We try to map the Roland MT32 instruments to\n"
-"General MIDI ones. It is still possible that\n"
-"some tracks sound incorrect."
+#: engines/scumm/help.cpp:79
+msgid "Pause game"
msgstr ""
-#: engines/kyra/saveload_eob.cpp:557
-#, c-format
-msgid ""
-"The following original save game file has been found in your game path:\n"
-"\n"
-"%s %s\n"
-"\n"
-"Do you wish to use this save game file with ScummVM?\n"
-"\n"
+#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:85
+#: engines/scumm/help.cpp:96 engines/scumm/help.cpp:97
+#: engines/scumm/help.cpp:98 engines/scumm/help.cpp:99
+#: engines/scumm/help.cpp:100 engines/scumm/help.cpp:101
+#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103
+msgid "Ctrl"
msgstr ""
-#: engines/kyra/saveload_eob.cpp:590
-#, c-format
-msgid ""
-"A save game file was found in the specified slot %d. Overwrite?\n"
-"\n"
+#: engines/scumm/help.cpp:80
+msgid "Load game state 1-10"
msgstr ""
-#: engines/kyra/saveload_eob.cpp:623
-#, c-format
-msgid ""
-"%d original save game files have been successfully imported into\n"
-"ScummVM. If you want to manually import original save game files later you "
-"will\n"
-"need to open the ScummVM debug console and use the command "
-"'import_savefile'.\n"
-"\n"
+#: engines/scumm/help.cpp:81 engines/scumm/help.cpp:85
+#: engines/scumm/help.cpp:87 engines/scumm/help.cpp:101
+#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103
+msgid "Alt"
msgstr ""
-#. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167
-msgid "~Z~ip Mode Activated"
+#: engines/scumm/help.cpp:81
+msgid "Save game state 1-10"
msgstr ""
-#: engines/mohawk/dialogs.cpp:93
-msgid "~T~ransitions Enabled"
+#: engines/scumm/help.cpp:87 engines/scumm/help.cpp:90
+msgid "Enter"
msgstr ""
-#. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:95
-msgid "~D~rop Page"
+#: engines/scumm/help.cpp:88
+msgid "Music volume up / down"
msgstr ""
-#: engines/mohawk/dialogs.cpp:99
-msgid "~S~how Map"
+#: engines/scumm/help.cpp:89
+msgid "Text speed slower / faster"
msgstr ""
-#: engines/mohawk/dialogs.cpp:105
-msgid "~M~ain Menu"
+#: engines/scumm/help.cpp:90
+msgid "Simulate left mouse button"
msgstr ""
-#: engines/mohawk/dialogs.cpp:168
-msgid "~W~ater Effect Enabled"
+#: engines/scumm/help.cpp:91
+msgid "Tab"
msgstr ""
-#: engines/neverhood/detection.cpp:167
-msgid "Skip the Hall of Records storyboard scenes"
+#: engines/scumm/help.cpp:91
+msgid "Simulate right mouse button"
msgstr ""
-#: engines/neverhood/detection.cpp:168
-msgid "Allows the player to skip past the Hall of Records storyboard scenes"
+#: engines/scumm/help.cpp:94
+msgid "Special keyboard commands:"
msgstr ""
-#: engines/neverhood/detection.cpp:174
-msgid "Scale the making of videos to full screen"
+#: engines/scumm/help.cpp:95
+msgid "Show / Hide console"
msgstr ""
-#: engines/neverhood/detection.cpp:175
-msgid "Scale the making of videos, so that they use the whole screen"
+#: engines/scumm/help.cpp:96
+msgid "Start the debugger"
msgstr ""
-#: engines/parallaction/saveload.cpp:133
-#, c-format
-msgid ""
-"Can't save game in slot %i\n"
-"\n"
+#: engines/scumm/help.cpp:97
+msgid "Show memory consumption"
msgstr ""
-#: engines/parallaction/saveload.cpp:204
-msgid "Loading game..."
+#: engines/scumm/help.cpp:98
+msgid "Run in fast mode (*)"
msgstr ""
-#: engines/parallaction/saveload.cpp:219
-msgid "Saving game..."
+#: engines/scumm/help.cpp:99
+msgid "Run in really fast mode (*)"
msgstr ""
-#: engines/parallaction/saveload.cpp:272
-msgid ""
-"ScummVM found that you have old savefiles for Nippon Safes that should be "
-"renamed.\n"
-"The old names are no longer supported, so you will not be able to load your "
-"games if you don't convert them.\n"
-"\n"
-"Press OK to convert them now, otherwise you will be asked next time.\n"
+#: engines/scumm/help.cpp:100
+msgid "Toggle mouse capture"
msgstr ""
-#: engines/parallaction/saveload.cpp:319
-msgid "ScummVM successfully converted all your savefiles."
+#: engines/scumm/help.cpp:101
+msgid "Switch between graphics filters"
msgstr ""
-#: engines/parallaction/saveload.cpp:321
-msgid ""
-"ScummVM printed some warnings in your console window and can't guarantee all "
-"your files have been converted.\n"
-"\n"
-"Please report to the team."
+#: engines/scumm/help.cpp:102
+msgid "Increase / Decrease scale factor"
msgstr ""
-#: engines/pegasus/pegasus.cpp:714
-msgid "Invalid save file name"
+#: engines/scumm/help.cpp:103
+msgid "Toggle aspect-ratio correction"
msgstr ""
-#: engines/pegasus/pegasus.cpp:2507
-msgid "Up/Zoom In/Move Forward/Open Doors"
+#: engines/scumm/help.cpp:108
+msgid "* Note that using ctrl-f and"
msgstr ""
-#: engines/pegasus/pegasus.cpp:2508
-msgid "Down/Zoom Out"
+#: engines/scumm/help.cpp:109
+msgid " ctrl-g are not recommended"
msgstr ""
-#: engines/pegasus/pegasus.cpp:2511
-msgid "Display/Hide Inventory Tray"
+#: engines/scumm/help.cpp:110
+msgid " since they may cause crashes"
msgstr ""
-#: engines/pegasus/pegasus.cpp:2512
-msgid "Display/Hide Biochip Tray"
+#: engines/scumm/help.cpp:111
+msgid " or incorrect game behavior."
msgstr ""
-#: engines/pegasus/pegasus.cpp:2513
-msgid "Action/Select"
+#: engines/scumm/help.cpp:115
+msgid "Spinning drafts on the keyboard:"
msgstr ""
-#: engines/pegasus/pegasus.cpp:2514
-msgid "Toggle Center Data Display"
+#: engines/scumm/help.cpp:117
+msgid "Main game controls:"
msgstr ""
-#: engines/pegasus/pegasus.cpp:2515
-msgid "Display/Hide Info Screen"
+#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137
+#: engines/scumm/help.cpp:162
+msgid "Push"
msgstr ""
-#: engines/pegasus/pegasus.cpp:2516
-msgid "Display/Hide Pause Menu"
+#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138
+#: engines/scumm/help.cpp:163
+msgid "Pull"
msgstr ""
-#: engines/queen/detection.cpp:56
-msgid "Alternative intro"
+#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139
+#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:198
+#: engines/scumm/help.cpp:208
+msgid "Give"
msgstr ""
-#: engines/queen/detection.cpp:57
-msgid "Use an alternative game intro (CD version only)"
+#: engines/scumm/help.cpp:125 engines/scumm/help.cpp:140
+#: engines/scumm/help.cpp:165 engines/scumm/help.cpp:191
+#: engines/scumm/help.cpp:209
+msgid "Open"
msgstr ""
-#: engines/sci/detection.cpp:374
-msgid "Skip EGA dithering pass (full color backgrounds)"
+#: engines/scumm/help.cpp:127
+msgid "Go to"
msgstr ""
-#: engines/sci/detection.cpp:375
-msgid "Skip dithering pass in EGA games, graphics are shown with full colors"
+#: engines/scumm/help.cpp:128
+msgid "Get"
msgstr ""
-#: engines/sci/detection.cpp:384
-msgid "Prefer digital sound effects"
+#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:153
+#: engines/scumm/help.cpp:171 engines/scumm/help.cpp:199
+#: engines/scumm/help.cpp:214 engines/scumm/help.cpp:225
+#: engines/scumm/help.cpp:251
+msgid "Use"
msgstr ""
-#: engines/sci/detection.cpp:385
-msgid "Prefer digital sound effects instead of synthesized ones"
+#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:142
+msgid "Read"
msgstr ""
-#: engines/sci/detection.cpp:404
-msgid "Use IMF/Yamaha FB-01 for MIDI output"
+#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:148
+msgid "New kid"
msgstr ""
-#: engines/sci/detection.cpp:405
-msgid ""
-"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI "
-"output"
+#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154
+#: engines/scumm/help.cpp:172
+msgid "Turn on"
msgstr ""
-#: engines/sci/detection.cpp:415
-msgid "Use CD audio"
+#: engines/scumm/help.cpp:133 engines/scumm/help.cpp:155
+#: engines/scumm/help.cpp:173
+msgid "Turn off"
msgstr ""
-#: engines/sci/detection.cpp:416
-msgid "Use CD audio instead of in-game audio, if available"
+#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168
+#: engines/scumm/help.cpp:195
+msgid "Walk to"
msgstr ""
-#: engines/sci/detection.cpp:426
-msgid "Use Windows cursors"
+#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169
+#: engines/scumm/help.cpp:196 engines/scumm/help.cpp:211
+#: engines/scumm/help.cpp:228
+msgid "Pick up"
msgstr ""
-#: engines/sci/detection.cpp:427
-msgid ""
-"Use the Windows cursors (smaller and monochrome) instead of the DOS ones"
+#: engines/scumm/help.cpp:145 engines/scumm/help.cpp:170
+msgid "What is"
msgstr ""
-#: engines/sci/detection.cpp:437
-msgid "Use silver cursors"
+#: engines/scumm/help.cpp:147
+msgid "Unlock"
msgstr ""
-#: engines/sci/detection.cpp:438
-msgid ""
-"Use the alternate set of silver cursors, instead of the normal golden ones"
+#: engines/scumm/help.cpp:150
+msgid "Put on"
msgstr ""
-#: engines/scumm/dialogs.cpp:176
-#, c-format
-msgid "Insert Disk %c and Press Button to Continue."
+#: engines/scumm/help.cpp:151
+msgid "Take off"
msgstr ""
-#: engines/scumm/dialogs.cpp:177
-#, c-format
-msgid "Unable to Find %s, (%c%d) Press Button."
+#: engines/scumm/help.cpp:157
+msgid "Fix"
msgstr ""
-#: engines/scumm/dialogs.cpp:178
-#, c-format
-msgid "Error reading disk %c, (%c%d) Press Button."
+#: engines/scumm/help.cpp:159
+msgid "Switch"
msgstr ""
-#: engines/scumm/dialogs.cpp:179
-msgid "Game Paused. Press SPACE to Continue."
+#: engines/scumm/help.cpp:167 engines/scumm/help.cpp:229
+msgid "Look"
msgstr ""
-#. I18N: You may specify 'Yes' symbol at the end of the line, like this:
-#. "Moechten Sie wirklich neu starten? (J/N)J"
-#. Will react to J as 'Yes'
-#: engines/scumm/dialogs.cpp:183
-msgid "Are you sure you want to restart? (Y/N)Y"
+#: engines/scumm/help.cpp:174 engines/scumm/help.cpp:224
+msgid "Talk"
msgstr ""
-#. I18N: you may specify 'Yes' symbol at the end of the line. See previous comment
-#: engines/scumm/dialogs.cpp:185
-msgid "Are you sure you want to quit? (Y/N)Y"
+#: engines/scumm/help.cpp:175
+msgid "Travel"
msgstr ""
-#: engines/scumm/dialogs.cpp:190
-msgid "Play"
+#: engines/scumm/help.cpp:176
+msgid "To Henry / To Indy"
msgstr ""
-#: engines/scumm/dialogs.cpp:194
-msgid "Insert save/load game disk"
+#. I18N: These are different musical notes
+#: engines/scumm/help.cpp:180
+msgid "play C minor on distaff"
msgstr ""
-#: engines/scumm/dialogs.cpp:195
-msgid "You must enter a name"
+#: engines/scumm/help.cpp:181
+msgid "play D on distaff"
msgstr ""
-#: engines/scumm/dialogs.cpp:196
-msgid "The game was NOT saved (disk full?)"
+#: engines/scumm/help.cpp:182
+msgid "play E on distaff"
msgstr ""
-#: engines/scumm/dialogs.cpp:197
-msgid "The game was NOT loaded"
+#: engines/scumm/help.cpp:183
+msgid "play F on distaff"
msgstr ""
-#: engines/scumm/dialogs.cpp:198
-#, c-format
-msgid "Saving '%s'"
+#: engines/scumm/help.cpp:184
+msgid "play G on distaff"
msgstr ""
-#: engines/scumm/dialogs.cpp:199
-#, c-format
-msgid "Loading '%s'"
+#: engines/scumm/help.cpp:185
+msgid "play A on distaff"
msgstr ""
-#: engines/scumm/dialogs.cpp:200
-msgid "Name your SAVE game"
+#: engines/scumm/help.cpp:186
+msgid "play B on distaff"
msgstr ""
-#: engines/scumm/dialogs.cpp:201
-msgid "Select a game to LOAD"
+#: engines/scumm/help.cpp:187
+msgid "play C major on distaff"
msgstr ""
-#: engines/scumm/dialogs.cpp:202
-msgid "Game title)"
+#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:215
+msgid "puSh"
msgstr ""
-#. I18N: Previous page button
-#: engines/scumm/dialogs.cpp:288
-msgid "~P~revious"
+#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:216
+msgid "pull (Yank)"
msgstr ""
-#. I18N: Next page button
-#: engines/scumm/dialogs.cpp:290
-msgid "~N~ext"
+#: engines/scumm/help.cpp:197 engines/scumm/help.cpp:213
+#: engines/scumm/help.cpp:249
+msgid "Talk to"
msgstr ""
-#: engines/scumm/dialogs.cpp:602
-msgid "Speech Only"
+#: engines/scumm/help.cpp:200 engines/scumm/help.cpp:212
+msgid "Look at"
msgstr ""
-#: engines/scumm/dialogs.cpp:603
-msgid "Speech and Subtitles"
+#: engines/scumm/help.cpp:201
+msgid "turn oN"
msgstr ""
-#: engines/scumm/dialogs.cpp:604
-msgid "Subtitles Only"
+#: engines/scumm/help.cpp:202
+msgid "turn oFf"
msgstr ""
-#: engines/scumm/dialogs.cpp:612
-msgctxt "lowres"
-msgid "Speech & Subs"
+#: engines/scumm/help.cpp:218
+msgid "KeyUp"
msgstr ""
-#: engines/scumm/dialogs.cpp:658
-msgid "Select a Proficiency Level."
+#: engines/scumm/help.cpp:218
+msgid "Highlight prev dialogue"
msgstr ""
-#: engines/scumm/dialogs.cpp:660
-msgid "Refer to your Loom(TM) manual for help."
+#: engines/scumm/help.cpp:219
+msgid "KeyDown"
msgstr ""
-#: engines/scumm/dialogs.cpp:664
-msgid "Practice"
+#: engines/scumm/help.cpp:219
+msgid "Highlight next dialogue"
msgstr ""
-#: engines/scumm/dialogs.cpp:665
-msgid "Expert"
+#: engines/scumm/help.cpp:223
+msgid "Walk"
msgstr ""
-#: engines/scumm/help.cpp:74
-msgid "Common keyboard commands:"
+#: engines/scumm/help.cpp:226 engines/scumm/help.cpp:235
+#: engines/scumm/help.cpp:242 engines/scumm/help.cpp:250
+msgid "Inventory"
msgstr ""
-#: engines/scumm/help.cpp:75
-msgid "Save / Load dialog"
+#: engines/scumm/help.cpp:227
+msgid "Object"
msgstr ""
-#: engines/scumm/help.cpp:77
-msgid "Skip line of text"
+#: engines/scumm/help.cpp:230
+msgid "Black and White / Color"
msgstr ""
-#: engines/scumm/help.cpp:78
-msgid "Esc"
+#: engines/scumm/help.cpp:233
+msgid "Eyes"
msgstr ""
-#: engines/scumm/help.cpp:78
-msgid "Skip cutscene"
+#: engines/scumm/help.cpp:234
+msgid "Tongue"
msgstr ""
-#: engines/scumm/help.cpp:79
-msgid "Space"
+#: engines/scumm/help.cpp:236
+msgid "Punch"
msgstr ""
-#: engines/scumm/help.cpp:79
-msgid "Pause game"
+#: engines/scumm/help.cpp:237
+msgid "Kick"
msgstr ""
-#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:85
-#: engines/scumm/help.cpp:96 engines/scumm/help.cpp:97
-#: engines/scumm/help.cpp:98 engines/scumm/help.cpp:99
-#: engines/scumm/help.cpp:100 engines/scumm/help.cpp:101
-#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103
-msgid "Ctrl"
+#: engines/scumm/help.cpp:240 engines/scumm/help.cpp:248
+msgid "Examine"
msgstr ""
-#: engines/scumm/help.cpp:80
-msgid "Load game state 1-10"
+#: engines/scumm/help.cpp:241
+msgid "Regular cursor"
msgstr ""
-#: engines/scumm/help.cpp:81 engines/scumm/help.cpp:85
-#: engines/scumm/help.cpp:87 engines/scumm/help.cpp:101
-#: engines/scumm/help.cpp:102 engines/scumm/help.cpp:103
-msgid "Alt"
+#. I18N: Comm is a communication device
+#: engines/scumm/help.cpp:244
+msgid "Comm"
msgstr ""
-#: engines/scumm/help.cpp:81
-msgid "Save game state 1-10"
+#: engines/scumm/help.cpp:247
+msgid "Save / Load / Options"
msgstr ""
-#: engines/scumm/help.cpp:87 engines/scumm/help.cpp:90
-msgid "Enter"
+#: engines/scumm/help.cpp:256
+msgid "Other game controls:"
msgstr ""
-#: engines/scumm/help.cpp:88
-msgid "Music volume up / down"
+#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:268
+msgid "Inventory:"
msgstr ""
-#: engines/scumm/help.cpp:89
-msgid "Text speed slower / faster"
+#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275
+msgid "Scroll list up"
msgstr ""
-#: engines/scumm/help.cpp:90
-msgid "Simulate left mouse button"
+#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:276
+msgid "Scroll list down"
msgstr ""
-#: engines/scumm/help.cpp:91
-msgid "Tab"
+#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:269
+msgid "Upper left item"
msgstr ""
-#: engines/scumm/help.cpp:91
-msgid "Simulate right mouse button"
+#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271
+msgid "Lower left item"
msgstr ""
-#: engines/scumm/help.cpp:94
-msgid "Special keyboard commands:"
+#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:272
+msgid "Upper right item"
msgstr ""
-#: engines/scumm/help.cpp:95
-msgid "Show / Hide console"
+#: engines/scumm/help.cpp:264 engines/scumm/help.cpp:274
+msgid "Lower right item"
msgstr ""
-#: engines/scumm/help.cpp:96
-msgid "Start the debugger"
+#: engines/scumm/help.cpp:270
+msgid "Middle left item"
msgstr ""
-#: engines/scumm/help.cpp:97
-msgid "Show memory consumption"
+#: engines/scumm/help.cpp:273
+msgid "Middle right item"
msgstr ""
-#: engines/scumm/help.cpp:98
-msgid "Run in fast mode (*)"
+#: engines/scumm/help.cpp:280 engines/scumm/help.cpp:285
+msgid "Switching characters:"
msgstr ""
-#: engines/scumm/help.cpp:99
-msgid "Run in really fast mode (*)"
+#: engines/scumm/help.cpp:282
+msgid "Second kid"
msgstr ""
-#: engines/scumm/help.cpp:100
-msgid "Toggle mouse capture"
+#: engines/scumm/help.cpp:283
+msgid "Third kid"
msgstr ""
-#: engines/scumm/help.cpp:101
-msgid "Switch between graphics filters"
+#: engines/scumm/help.cpp:292
+msgid "Toggle Inventory/IQ Points display"
msgstr ""
-#: engines/scumm/help.cpp:102
-msgid "Increase / Decrease scale factor"
+#: engines/scumm/help.cpp:293
+msgid "Toggle Keyboard/Mouse Fighting (*)"
msgstr ""
-#: engines/scumm/help.cpp:103
-msgid "Toggle aspect-ratio correction"
+#: engines/scumm/help.cpp:295
+msgid "* Keyboard Fighting is always on,"
msgstr ""
-#: engines/scumm/help.cpp:108
-msgid "* Note that using ctrl-f and"
+#: engines/scumm/help.cpp:296
+msgid " so despite the in-game message this"
msgstr ""
-#: engines/scumm/help.cpp:109
-msgid " ctrl-g are not recommended"
+#: engines/scumm/help.cpp:297
+msgid " actually toggles Mouse Fighting Off/On"
msgstr ""
-#: engines/scumm/help.cpp:110
-msgid " since they may cause crashes"
+#: engines/scumm/help.cpp:304
+msgid "Fighting controls (numpad):"
msgstr ""
-#: engines/scumm/help.cpp:111
-msgid " or incorrect game behavior."
+#: engines/scumm/help.cpp:305 engines/scumm/help.cpp:306
+#: engines/scumm/help.cpp:307
+msgid "Step back"
msgstr ""
-#: engines/scumm/help.cpp:115
-msgid "Spinning drafts on the keyboard:"
+#: engines/scumm/help.cpp:308
+msgid "Block high"
msgstr ""
-#: engines/scumm/help.cpp:117
-msgid "Main game controls:"
+#: engines/scumm/help.cpp:309
+msgid "Block middle"
msgstr ""
-#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137
-#: engines/scumm/help.cpp:162
-msgid "Push"
+#: engines/scumm/help.cpp:310
+msgid "Block low"
msgstr ""
-#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138
-#: engines/scumm/help.cpp:163
-msgid "Pull"
+#: engines/scumm/help.cpp:311
+msgid "Punch high"
msgstr ""
-#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139
-#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:198
-#: engines/scumm/help.cpp:208
-msgid "Give"
+#: engines/scumm/help.cpp:312
+msgid "Punch middle"
msgstr ""
-#: engines/scumm/help.cpp:125 engines/scumm/help.cpp:140
-#: engines/scumm/help.cpp:165 engines/scumm/help.cpp:191
-#: engines/scumm/help.cpp:209
-msgid "Open"
+#: engines/scumm/help.cpp:313
+msgid "Punch low"
msgstr ""
-#: engines/scumm/help.cpp:127
-msgid "Go to"
+#: engines/scumm/help.cpp:315
+msgid "Sucker punch"
msgstr ""
-#: engines/scumm/help.cpp:128
-msgid "Get"
+#: engines/scumm/help.cpp:318
+msgid "These are for Indy on left."
msgstr ""
-#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:153
-#: engines/scumm/help.cpp:171 engines/scumm/help.cpp:199
-#: engines/scumm/help.cpp:214 engines/scumm/help.cpp:225
-#: engines/scumm/help.cpp:251
-msgid "Use"
+#: engines/scumm/help.cpp:319
+msgid "When Indy is on the right,"
msgstr ""
-#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:142
-msgid "Read"
+#: engines/scumm/help.cpp:320
+msgid "7, 4, and 1 are switched with"
msgstr ""
-#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:148
-msgid "New kid"
+#: engines/scumm/help.cpp:321
+msgid "9, 6, and 3, respectively."
msgstr ""
-#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154
-#: engines/scumm/help.cpp:172
-msgid "Turn on"
+#: engines/scumm/help.cpp:328
+msgid "Biplane controls (numpad):"
msgstr ""
-#: engines/scumm/help.cpp:133 engines/scumm/help.cpp:155
-#: engines/scumm/help.cpp:173
-msgid "Turn off"
+#: engines/scumm/help.cpp:329
+msgid "Fly to upper left"
msgstr ""
-#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168
-#: engines/scumm/help.cpp:195
-msgid "Walk to"
+#: engines/scumm/help.cpp:330
+msgid "Fly to left"
msgstr ""
-#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169
-#: engines/scumm/help.cpp:196 engines/scumm/help.cpp:211
-#: engines/scumm/help.cpp:228
-msgid "Pick up"
+#: engines/scumm/help.cpp:331
+msgid "Fly to lower left"
msgstr ""
-#: engines/scumm/help.cpp:145 engines/scumm/help.cpp:170
-msgid "What is"
-msgstr ""
+#: engines/scumm/help.cpp:332
+msgid "Fly upwards"
+msgstr ""
-#: engines/scumm/help.cpp:147
-msgid "Unlock"
+#: engines/scumm/help.cpp:333
+msgid "Fly straight"
msgstr ""
-#: engines/scumm/help.cpp:150
-msgid "Put on"
+#: engines/scumm/help.cpp:334
+msgid "Fly down"
msgstr ""
-#: engines/scumm/help.cpp:151
-msgid "Take off"
+#: engines/scumm/help.cpp:335
+msgid "Fly to upper right"
msgstr ""
-#: engines/scumm/help.cpp:157
-msgid "Fix"
+#: engines/scumm/help.cpp:336
+msgid "Fly to right"
msgstr ""
-#: engines/scumm/help.cpp:159
-msgid "Switch"
+#: engines/scumm/help.cpp:337
+msgid "Fly to lower right"
msgstr ""
-#: engines/scumm/help.cpp:167 engines/scumm/help.cpp:229
-msgid "Look"
+#: engines/scumm/input.cpp:572
+msgid "Snap scroll on"
msgstr ""
-#: engines/scumm/help.cpp:174 engines/scumm/help.cpp:224
-msgid "Talk"
+#: engines/scumm/input.cpp:574
+msgid "Snap scroll off"
msgstr ""
-#: engines/scumm/help.cpp:175
-msgid "Travel"
+#: engines/scumm/input.cpp:587
+msgid "Music volume: "
msgstr ""
-#: engines/scumm/help.cpp:176
-msgid "To Henry / To Indy"
+#: engines/scumm/input.cpp:604
+msgid "Subtitle speed: "
msgstr ""
-#. I18N: These are different musical notes
-#: engines/scumm/help.cpp:180
-msgid "play C minor on distaff"
+#: engines/scumm/scumm.cpp:1832
+#, c-format
+msgid ""
+"Native MIDI support requires the Roland Upgrade from LucasArts,\n"
+"but %s is missing. Using AdLib instead."
msgstr ""
-#: engines/scumm/help.cpp:181
-msgid "play D on distaff"
+#: engines/scumm/scumm.cpp:2644
+msgid ""
+"Usually, Maniac Mansion would start now. But for that to work, the game "
+"files for Maniac Mansion have to be in the 'Maniac' directory inside the "
+"Tentacle game directory, and the game has to be added to ScummVM."
msgstr ""
-#: engines/scumm/help.cpp:182
-msgid "play E on distaff"
+#: engines/scumm/players/player_v3m.cpp:129
+msgid ""
+"Could not find the 'Loom' Macintosh executable to read the\n"
+"instruments from. Music will be disabled."
msgstr ""
-#: engines/scumm/help.cpp:183
-msgid "play F on distaff"
+#: engines/scumm/players/player_v5m.cpp:107
+msgid ""
+"Could not find the 'Monkey Island' Macintosh executable to read the\n"
+"instruments from. Music will be disabled."
msgstr ""
-#: engines/scumm/help.cpp:184
-msgid "play G on distaff"
+#: engines/groovie/detection.cpp:312
+msgid "Fast movie speed"
msgstr ""
-#: engines/scumm/help.cpp:185
-msgid "play A on distaff"
+#: engines/groovie/detection.cpp:313
+msgid "Play movies at an increased speed"
msgstr ""
-#: engines/scumm/help.cpp:186
-msgid "play B on distaff"
+#: engines/groovie/script.cpp:408
+msgid "Failed to save game"
msgstr ""
-#: engines/scumm/help.cpp:187
-msgid "play C major on distaff"
+#: engines/sky/compact.cpp:130
+msgid ""
+"Unable to find \"sky.cpt\" file!\n"
+"Please download it from www.scummvm.org"
msgstr ""
-#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:215
-msgid "puSh"
+#: engines/sky/compact.cpp:141
+msgid ""
+"The \"sky.cpt\" file has an incorrect size.\n"
+"Please (re)download it from www.scummvm.org"
msgstr ""
-#: engines/scumm/help.cpp:194 engines/scumm/help.cpp:216
-msgid "pull (Yank)"
+#: engines/sky/detection.cpp:44
+msgid "Floppy intro"
msgstr ""
-#: engines/scumm/help.cpp:197 engines/scumm/help.cpp:213
-#: engines/scumm/help.cpp:249
-msgid "Talk to"
+#: engines/sky/detection.cpp:45
+msgid "Use the floppy version's intro (CD version only)"
msgstr ""
-#: engines/scumm/help.cpp:200 engines/scumm/help.cpp:212
-msgid "Look at"
+#: engines/sword2/animation.cpp:425
+msgid ""
+"PSX cutscenes found but ScummVM has been built without RGB color support"
msgstr ""
-#: engines/scumm/help.cpp:201
-msgid "turn oN"
+#: engines/sword2/animation.cpp:445 engines/sword1/animation.cpp:545
+msgid "DXA cutscenes found but ScummVM has been built without zlib"
msgstr ""
-#: engines/scumm/help.cpp:202
-msgid "turn oFf"
+#: engines/sword2/animation.cpp:461 engines/sword1/animation.cpp:561
+msgid ""
+"MPEG-2 cutscenes found but ScummVM has been built without MPEG-2 support"
msgstr ""
-#: engines/scumm/help.cpp:218
-msgid "KeyUp"
+#: engines/sword2/animation.cpp:470 engines/sword1/animation.cpp:568
+#, c-format
+msgid "Cutscene '%s' not found"
msgstr ""
-#: engines/scumm/help.cpp:218
-msgid "Highlight prev dialogue"
+#: engines/sword2/sword2.cpp:79
+msgid "Show object labels"
msgstr ""
-#: engines/scumm/help.cpp:219
-msgid "KeyDown"
+#: engines/sword2/sword2.cpp:80
+msgid "Show labels for objects on mouse hover"
msgstr ""
-#: engines/scumm/help.cpp:219
-msgid "Highlight next dialogue"
+#: engines/sword1/animation.cpp:524
+#, c-format
+msgid "PSX stream cutscene '%s' cannot be played in paletted mode"
msgstr ""
-#: engines/scumm/help.cpp:223
-msgid "Walk"
+#: engines/sword1/control.cpp:863
+msgid ""
+"ScummVM found that you have old savefiles for Broken Sword 1 that should be "
+"converted.\n"
+"The old save game format is no longer supported, so you will not be able to "
+"load your games if you don't convert them.\n"
+"\n"
+"Press OK to convert them now, otherwise you will be asked again the next "
+"time you start the game.\n"
msgstr ""
-#: engines/scumm/help.cpp:226 engines/scumm/help.cpp:235
-#: engines/scumm/help.cpp:242 engines/scumm/help.cpp:250
-msgid "Inventory"
+#: engines/sword1/control.cpp:1232
+#, c-format
+msgid ""
+"Target new save game already exists!\n"
+"Would you like to keep the old save game (%s) or the new one (%s)?\n"
msgstr ""
-#: engines/scumm/help.cpp:227
-msgid "Object"
+#: engines/sword1/control.cpp:1235
+msgid "Keep the old one"
msgstr ""
-#: engines/scumm/help.cpp:230
-msgid "Black and White / Color"
+#: engines/sword1/control.cpp:1235
+msgid "Keep the new one"
msgstr ""
-#: engines/scumm/help.cpp:233
-msgid "Eyes"
+#: engines/sword1/logic.cpp:1633
+msgid "This is the end of the Broken Sword 1 Demo"
msgstr ""
-#: engines/scumm/help.cpp:234
-msgid "Tongue"
+#: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86
+msgid "Gore Mode"
msgstr ""
-#: engines/scumm/help.cpp:236
-msgid "Punch"
+#: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87
+msgid "Enable Gore Mode when available"
msgstr ""
-#: engines/scumm/help.cpp:237
-msgid "Kick"
+#: engines/pegasus/pegasus.cpp:714
+msgid "Invalid save file name"
msgstr ""
-#: engines/scumm/help.cpp:240 engines/scumm/help.cpp:248
-msgid "Examine"
+#: engines/pegasus/pegasus.cpp:2507
+msgid "Up/Zoom In/Move Forward/Open Doors"
msgstr ""
-#: engines/scumm/help.cpp:241
-msgid "Regular cursor"
+#: engines/pegasus/pegasus.cpp:2508
+msgid "Down/Zoom Out"
msgstr ""
-#. I18N: Comm is a communication device
-#: engines/scumm/help.cpp:244
-msgid "Comm"
+#: engines/pegasus/pegasus.cpp:2509 engines/kyra/lol.cpp:485
+msgid "Turn Left"
msgstr ""
-#: engines/scumm/help.cpp:247
-msgid "Save / Load / Options"
+#: engines/pegasus/pegasus.cpp:2510 engines/kyra/lol.cpp:486
+msgid "Turn Right"
msgstr ""
-#: engines/scumm/help.cpp:256
-msgid "Other game controls:"
+#: engines/pegasus/pegasus.cpp:2511
+msgid "Display/Hide Inventory Tray"
msgstr ""
-#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:268
-msgid "Inventory:"
+#: engines/pegasus/pegasus.cpp:2512
+msgid "Display/Hide Biochip Tray"
msgstr ""
-#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275
-msgid "Scroll list up"
+#: engines/pegasus/pegasus.cpp:2513
+msgid "Action/Select"
msgstr ""
-#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:276
-msgid "Scroll list down"
+#: engines/pegasus/pegasus.cpp:2514
+msgid "Toggle Center Data Display"
msgstr ""
-#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:269
-msgid "Upper left item"
+#: engines/pegasus/pegasus.cpp:2515
+msgid "Display/Hide Info Screen"
msgstr ""
-#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271
-msgid "Lower left item"
+#: engines/pegasus/pegasus.cpp:2516
+msgid "Display/Hide Pause Menu"
msgstr ""
-#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:272
-msgid "Upper right item"
+#: engines/wintermute/detection.cpp:58
+msgid "Show FPS-counter"
msgstr ""
-#: engines/scumm/help.cpp:264 engines/scumm/help.cpp:274
-msgid "Lower right item"
+#: engines/wintermute/detection.cpp:59
+msgid "Show the current number of frames per second in the upper left corner"
msgstr ""
-#: engines/scumm/help.cpp:270
-msgid "Middle left item"
+#: engines/sci/detection.cpp:374
+msgid "Skip EGA dithering pass (full color backgrounds)"
msgstr ""
-#: engines/scumm/help.cpp:273
-msgid "Middle right item"
+#: engines/sci/detection.cpp:375
+msgid "Skip dithering pass in EGA games, graphics are shown with full colors"
msgstr ""
-#: engines/scumm/help.cpp:280 engines/scumm/help.cpp:285
-msgid "Switching characters:"
+#: engines/sci/detection.cpp:384
+msgid "Prefer digital sound effects"
msgstr ""
-#: engines/scumm/help.cpp:282
-msgid "Second kid"
+#: engines/sci/detection.cpp:385
+msgid "Prefer digital sound effects instead of synthesized ones"
msgstr ""
-#: engines/scumm/help.cpp:283
-msgid "Third kid"
+#: engines/sci/detection.cpp:404
+msgid "Use IMF/Yamaha FB-01 for MIDI output"
msgstr ""
-#: engines/scumm/help.cpp:292
-msgid "Toggle Inventory/IQ Points display"
+#: engines/sci/detection.cpp:405
+msgid ""
+"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI "
+"output"
msgstr ""
-#: engines/scumm/help.cpp:293
-msgid "Toggle Keyboard/Mouse Fighting (*)"
+#: engines/sci/detection.cpp:415
+msgid "Use CD audio"
msgstr ""
-#: engines/scumm/help.cpp:295
-msgid "* Keyboard Fighting is always on,"
+#: engines/sci/detection.cpp:416
+msgid "Use CD audio instead of in-game audio, if available"
msgstr ""
-#: engines/scumm/help.cpp:296
-msgid " so despite the in-game message this"
+#: engines/sci/detection.cpp:426
+msgid "Use Windows cursors"
msgstr ""
-#: engines/scumm/help.cpp:297
-msgid " actually toggles Mouse Fighting Off/On"
+#: engines/sci/detection.cpp:427
+msgid ""
+"Use the Windows cursors (smaller and monochrome) instead of the DOS ones"
msgstr ""
-#: engines/scumm/help.cpp:304
-msgid "Fighting controls (numpad):"
+#: engines/sci/detection.cpp:437
+msgid "Use silver cursors"
msgstr ""
-#: engines/scumm/help.cpp:305 engines/scumm/help.cpp:306
-#: engines/scumm/help.cpp:307
-msgid "Step back"
+#: engines/sci/detection.cpp:438
+msgid ""
+"Use the alternate set of silver cursors, instead of the normal golden ones"
msgstr ""
-#: engines/scumm/help.cpp:308
-msgid "Block high"
+#: engines/parallaction/saveload.cpp:133
+#, c-format
+msgid ""
+"Can't save game in slot %i\n"
+"\n"
msgstr ""
-#: engines/scumm/help.cpp:309
-msgid "Block middle"
+#: engines/parallaction/saveload.cpp:204
+msgid "Loading game..."
msgstr ""
-#: engines/scumm/help.cpp:310
-msgid "Block low"
+#: engines/parallaction/saveload.cpp:219
+msgid "Saving game..."
msgstr ""
-#: engines/scumm/help.cpp:311
-msgid "Punch high"
+#: engines/parallaction/saveload.cpp:272
+msgid ""
+"ScummVM found that you have old savefiles for Nippon Safes that should be "
+"renamed.\n"
+"The old names are no longer supported, so you will not be able to load your "
+"games if you don't convert them.\n"
+"\n"
+"Press OK to convert them now, otherwise you will be asked next time.\n"
msgstr ""
-#: engines/scumm/help.cpp:312
-msgid "Punch middle"
+#: engines/parallaction/saveload.cpp:319
+msgid "ScummVM successfully converted all your savefiles."
msgstr ""
-#: engines/scumm/help.cpp:313
-msgid "Punch low"
+#: engines/parallaction/saveload.cpp:321
+msgid ""
+"ScummVM printed some warnings in your console window and can't guarantee all "
+"your files have been converted.\n"
+"\n"
+"Please report to the team."
msgstr ""
-#: engines/scumm/help.cpp:315
-msgid "Sucker punch"
+#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:101
+msgid "Color Blind Mode"
msgstr ""
-#: engines/scumm/help.cpp:318
-msgid "These are for Indy on left."
+#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:102
+msgid "Enable Color Blind Mode by default"
msgstr ""
-#: engines/scumm/help.cpp:319
-msgid "When Indy is on the right,"
+#: engines/tinsel/saveload.cpp:532 engines/gob/inter_playtoons.cpp:256
+#: engines/gob/inter_v2.cpp:1470 engines/gob/inter_geisha.cpp:232
+msgid "Failed to load game state from file."
msgstr ""
-#: engines/scumm/help.cpp:320
-msgid "7, 4, and 1 are switched with"
+#: engines/tinsel/saveload.cpp:545 engines/gob/inter_v2.cpp:1540
+#: engines/gob/inter_geisha.cpp:263
+msgid "Failed to save game state to file."
msgstr ""
-#: engines/scumm/help.cpp:321
-msgid "9, 6, and 3, respectively."
+#: engines/zvision/detection_tables.h:52
+msgid "Use the original save/load screens instead of the ScummVM interface"
msgstr ""
-#: engines/scumm/help.cpp:328
-msgid "Biplane controls (numpad):"
+#: engines/zvision/detection_tables.h:61
+msgid "Double FPS"
msgstr ""
-#: engines/scumm/help.cpp:329
-msgid "Fly to upper left"
+#: engines/zvision/detection_tables.h:62
+msgid "Increase framerate from 30 to 60 FPS"
msgstr ""
-#: engines/scumm/help.cpp:330
-msgid "Fly to left"
+#: engines/zvision/detection_tables.h:71
+msgid "Enable Venus"
msgstr ""
-#: engines/scumm/help.cpp:331
-msgid "Fly to lower left"
+#: engines/zvision/detection_tables.h:72
+msgid "Enable the Venus help system"
msgstr ""
-#: engines/scumm/help.cpp:332
-msgid "Fly upwards"
+#: engines/zvision/detection_tables.h:81
+msgid "Disable animation while turning"
msgstr ""
-#: engines/scumm/help.cpp:333
-msgid "Fly straight"
+#: engines/zvision/detection_tables.h:82
+msgid "Disable animation while turning in panorama mode"
msgstr ""
-#: engines/scumm/help.cpp:334
-msgid "Fly down"
+#: engines/zvision/detection_tables.h:91
+msgid "Use high resolution MPEG video"
msgstr ""
-#: engines/scumm/help.cpp:335
-msgid "Fly to upper right"
+#: engines/zvision/detection_tables.h:92
+msgid "Use MPEG video from the DVD version, instead of lower resolution AVI"
msgstr ""
-#: engines/scumm/help.cpp:336
-msgid "Fly to right"
+#: engines/teenagent/resources.cpp:95
+msgid ""
+"You're missing the 'teenagent.dat' file. Get it from the ScummVM website"
msgstr ""
-#: engines/scumm/help.cpp:337
-msgid "Fly to lower right"
+#: engines/teenagent/resources.cpp:116
+msgid ""
+"The teenagent.dat file is compressed and zlib hasn't been included in this "
+"executable. Please decompress it"
msgstr ""
-#: engines/scumm/input.cpp:572
-msgid "Snap scroll on"
+#: engines/drascula/saveload.cpp:47
+msgid ""
+"ScummVM found that you have old savefiles for Drascula that should be "
+"converted.\n"
+"The old save game format is no longer supported, so you will not be able to "
+"load your games if you don't convert them.\n"
+"\n"
+"Press OK to convert them now, otherwise you will be asked again the next "
+"time you start the game.\n"
msgstr ""
-#: engines/scumm/input.cpp:574
-msgid "Snap scroll off"
+#. I18N: Studio audience adds an applause and cheering sounds whenever
+#. Malcolm makes a joke.
+#: engines/kyra/detection.cpp:62
+msgid "Studio audience"
msgstr ""
-#: engines/scumm/input.cpp:587
-msgid "Music volume: "
+#: engines/kyra/detection.cpp:63
+msgid "Enable studio audience"
msgstr ""
-#: engines/scumm/input.cpp:604
-msgid "Subtitle speed: "
+#. I18N: This option allows the user to skip text and cutscenes.
+#: engines/kyra/detection.cpp:73
+msgid "Skip support"
msgstr ""
-#: engines/scumm/scumm.cpp:1832
-#, c-format
-msgid ""
-"Native MIDI support requires the Roland Upgrade from LucasArts,\n"
-"but %s is missing. Using AdLib instead."
+#: engines/kyra/detection.cpp:74
+msgid "Allow text and cutscenes to be skipped"
msgstr ""
-#: engines/scumm/scumm.cpp:2644
-msgid ""
-"Usually, Maniac Mansion would start now. But for that to work, the game "
-"files for Maniac Mansion have to be in the 'Maniac' directory inside the "
-"Tentacle game directory, and the game has to be added to ScummVM."
+#. I18N: Helium mode makes people sound like they've inhaled Helium.
+#: engines/kyra/detection.cpp:84
+msgid "Helium mode"
msgstr ""
-#: engines/scumm/players/player_v3m.cpp:129
-msgid ""
-"Could not find the 'Loom' Macintosh executable to read the\n"
-"instruments from. Music will be disabled."
+#: engines/kyra/detection.cpp:85
+msgid "Enable helium mode"
msgstr ""
-#: engines/scumm/players/player_v5m.cpp:107
-msgid ""
-"Could not find the 'Monkey Island' Macintosh executable to read the\n"
-"instruments from. Music will be disabled."
+#. I18N: When enabled, this option makes scrolling smoother when
+#. changing from one screen to another.
+#: engines/kyra/detection.cpp:99
+msgid "Smooth scrolling"
msgstr ""
-#: engines/sky/compact.cpp:130
-msgid ""
-"Unable to find \"sky.cpt\" file!\n"
-"Please download it from www.scummvm.org"
+#: engines/kyra/detection.cpp:100
+msgid "Enable smooth scrolling when walking"
msgstr ""
-#: engines/sky/compact.cpp:141
-msgid ""
-"The \"sky.cpt\" file has an incorrect size.\n"
-"Please (re)download it from www.scummvm.org"
+#. I18N: When enabled, this option changes the cursor when it floats to the
+#. edge of the screen to a directional arrow. The player can then click to
+#. walk towards that direction.
+#: engines/kyra/detection.cpp:112
+msgid "Floating cursors"
msgstr ""
-#: engines/sky/detection.cpp:44
-msgid "Floppy intro"
+#: engines/kyra/detection.cpp:113
+msgid "Enable floating cursors"
msgstr ""
-#: engines/sky/detection.cpp:45
-msgid "Use the floppy version's intro (CD version only)"
+#. I18N: HP stands for Hit Points
+#: engines/kyra/detection.cpp:127
+msgid "HP bar graphs"
msgstr ""
-#: engines/sword1/animation.cpp:524
-#, c-format
-msgid "PSX stream cutscene '%s' cannot be played in paletted mode"
+#: engines/kyra/detection.cpp:128
+msgid "Enable hit point bar graphs"
msgstr ""
-#: engines/sword1/animation.cpp:545 engines/sword2/animation.cpp:445
-msgid "DXA cutscenes found but ScummVM has been built without zlib"
+#: engines/kyra/lol.cpp:478
+msgid "Attack 1"
msgstr ""
-#: engines/sword1/animation.cpp:561 engines/sword2/animation.cpp:461
-msgid ""
-"MPEG-2 cutscenes found but ScummVM has been built without MPEG-2 support"
+#: engines/kyra/lol.cpp:479
+msgid "Attack 2"
msgstr ""
-#: engines/sword1/animation.cpp:568 engines/sword2/animation.cpp:470
-#, c-format
-msgid "Cutscene '%s' not found"
+#: engines/kyra/lol.cpp:480
+msgid "Attack 3"
msgstr ""
-#: engines/sword1/control.cpp:863
-msgid ""
-"ScummVM found that you have old savefiles for Broken Sword 1 that should be "
-"converted.\n"
-"The old save game format is no longer supported, so you will not be able to "
-"load your games if you don't convert them.\n"
-"\n"
-"Press OK to convert them now, otherwise you will be asked again the next "
-"time you start the game.\n"
+#: engines/kyra/lol.cpp:481
+msgid "Move Forward"
msgstr ""
-#: engines/sword1/control.cpp:1232
-#, c-format
-msgid ""
-"Target new save game already exists!\n"
-"Would you like to keep the old save game (%s) or the new one (%s)?\n"
+#: engines/kyra/lol.cpp:482
+msgid "Move Back"
msgstr ""
-#: engines/sword1/control.cpp:1235
-msgid "Keep the old one"
+#: engines/kyra/lol.cpp:483
+msgid "Slide Left"
msgstr ""
-#: engines/sword1/control.cpp:1235
-msgid "Keep the new one"
+#: engines/kyra/lol.cpp:484
+msgid "Slide Right"
msgstr ""
-#: engines/sword1/logic.cpp:1633
-msgid "This is the end of the Broken Sword 1 Demo"
+#: engines/kyra/lol.cpp:487
+msgid "Rest"
msgstr ""
-#: engines/sword2/animation.cpp:425
-msgid ""
-"PSX cutscenes found but ScummVM has been built without RGB color support"
+#: engines/kyra/lol.cpp:488
+msgid "Options"
msgstr ""
-#: engines/sword2/sword2.cpp:79
-msgid "Show object labels"
+#: engines/kyra/lol.cpp:489
+msgid "Choose Spell"
msgstr ""
-#: engines/sword2/sword2.cpp:80
-msgid "Show labels for objects on mouse hover"
+#: engines/kyra/sound_midi.cpp:477
+msgid ""
+"You appear to be using a General MIDI device,\n"
+"but your game only supports Roland MT32 MIDI.\n"
+"We try to map the Roland MT32 instruments to\n"
+"General MIDI ones. It is still possible that\n"
+"some tracks sound incorrect."
msgstr ""
-#: engines/teenagent/resources.cpp:95
+#: engines/kyra/saveload_eob.cpp:557
+#, c-format
msgid ""
-"You're missing the 'teenagent.dat' file. Get it from the ScummVM website"
+"The following original save game file has been found in your game path:\n"
+"\n"
+"%s %s\n"
+"\n"
+"Do you wish to use this save game file with ScummVM?\n"
+"\n"
msgstr ""
-#: engines/teenagent/resources.cpp:116
+#: engines/kyra/saveload_eob.cpp:590
+#, c-format
msgid ""
-"The teenagent.dat file is compressed and zlib hasn't been included in this "
-"executable. Please decompress it"
+"A save game file was found in the specified slot %d. Overwrite?\n"
+"\n"
msgstr ""
-#: engines/wintermute/detection.cpp:58
-msgid "Show FPS-counter"
+#: engines/kyra/saveload_eob.cpp:623
+#, c-format
+msgid ""
+"%d original save game files have been successfully imported into\n"
+"ScummVM. If you want to manually import original save game files later you "
+"will\n"
+"need to open the ScummVM debug console and use the command "
+"'import_savefile'.\n"
+"\n"
msgstr ""
-#: engines/wintermute/detection.cpp:59
-msgid "Show the current number of frames per second in the upper left corner"
+#: engines/neverhood/detection.cpp:167
+msgid "Skip the Hall of Records storyboard scenes"
msgstr ""
-#: engines/zvision/detection_tables.h:52
-msgid "Use the original save/load screens instead of the ScummVM interface"
+#: engines/neverhood/detection.cpp:168
+msgid "Allows the player to skip past the Hall of Records storyboard scenes"
msgstr ""
-#: engines/zvision/detection_tables.h:61
-msgid "Double FPS"
+#: engines/neverhood/detection.cpp:174
+msgid "Scale the making of videos to full screen"
msgstr ""
-#: engines/zvision/detection_tables.h:62
-msgid "Increase framerate from 30 to 60 FPS"
+#: engines/neverhood/detection.cpp:175
+msgid "Scale the making of videos, so that they use the whole screen"
msgstr ""
-#: engines/zvision/detection_tables.h:71
-msgid "Enable Venus"
+#: engines/gob/inter_v5.cpp:107
+msgid "Failed to delete file."
msgstr ""
-#: engines/zvision/detection_tables.h:72
-msgid "Enable the Venus help system"
+#. I18N: Option for fast scene switching
+#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167
+msgid "~Z~ip Mode Activated"
msgstr ""
-#: engines/zvision/detection_tables.h:81
-msgid "Disable animation while turning"
+#: engines/mohawk/dialogs.cpp:93
+msgid "~T~ransitions Enabled"
msgstr ""
-#: engines/zvision/detection_tables.h:82
-msgid "Disable animation while turning in panorama mode"
+#. I18N: Drop book page
+#: engines/mohawk/dialogs.cpp:95
+msgid "~D~rop Page"
msgstr ""
-#: engines/zvision/detection_tables.h:91
-msgid "Use high resolution MPEG video"
+#: engines/mohawk/dialogs.cpp:99
+msgid "~S~how Map"
msgstr ""
-#: engines/zvision/detection_tables.h:92
-msgid "Use MPEG video from the DVD version, instead of lower resolution AVI"
+#: engines/mohawk/dialogs.cpp:105
+msgid "~M~ain Menu"
+msgstr ""
+
+#: engines/mohawk/dialogs.cpp:168
+msgid "~W~ater Effect Enabled"
msgstr ""
Commit: 29ade784e43f73dd10c63df193baeda958f370c6
https://github.com/scummvm/scummvm/commit/29ade784e43f73dd10c63df193baeda958f370c6
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-21T23:41:30+01:00
Commit Message:
AGI: Give a nicer error message on invalid render mode.
Changed paths:
engines/agi/graphics.cpp
diff --git a/engines/agi/graphics.cpp b/engines/agi/graphics.cpp
index c5cede7..b46e6f7 100644
--- a/engines/agi/graphics.cpp
+++ b/engines/agi/graphics.cpp
@@ -1055,7 +1055,7 @@ int GfxMgr::initVideo() {
// Set the old common alternative Amiga palette
initPalette(altAmigaPalette);
} else
- error("initVideo: Unhandled render mode");
+ error("initVideo: Unhandled render mode \"%s\"", Common::getRenderModeDescription(_vm->_renderMode));
if ((_agiScreen = (uint8 *)calloc(GFX_WIDTH, GFX_HEIGHT)) == NULL)
return errNotEnoughMemory;
Commit: b166cb84e2b57714c1817d4e69e98acd2cd455b6
https://github.com/scummvm/scummvm/commit/b166cb84e2b57714c1817d4e69e98acd2cd455b6
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-21T23:48:48+01:00
Commit Message:
COMMON: Use spaces for beautifying formatting.
Changed paths:
common/gui_options.cpp
common/gui_options.h
common/rendermode.cpp
diff --git a/common/gui_options.cpp b/common/gui_options.cpp
index ab5a132..679d04b 100644
--- a/common/gui_options.cpp
+++ b/common/gui_options.cpp
@@ -53,17 +53,17 @@ const struct GameOpt {
{ GUIO_NOASPECT, "noAspect" },
- { GUIO_RENDERHERCGREEN, "hercGreen" },
- { GUIO_RENDERHERCAMBER, "hercAmber" },
- { GUIO_RENDERCGA, "cga" },
- { GUIO_RENDEREGA, "ega" },
- { GUIO_RENDERVGA, "vga" },
- { GUIO_RENDERAMIGA, "amiga" },
- { GUIO_RENDERFMTOWNS, "fmtowns" },
- { GUIO_RENDERPC9821, "pc9821" },
- { GUIO_RENDERPC9801, "pc9801" },
- { GUIO_RENDERAPPLE2GS, "2gs" },
- { GUIO_RENDERATARIST, "atari" },
+ { GUIO_RENDERHERCGREEN, "hercGreen" },
+ { GUIO_RENDERHERCAMBER, "hercAmber" },
+ { GUIO_RENDERCGA, "cga" },
+ { GUIO_RENDEREGA, "ega" },
+ { GUIO_RENDERVGA, "vga" },
+ { GUIO_RENDERAMIGA, "amiga" },
+ { GUIO_RENDERFMTOWNS, "fmtowns" },
+ { GUIO_RENDERPC9821, "pc9821" },
+ { GUIO_RENDERPC9801, "pc9801" },
+ { GUIO_RENDERAPPLE2GS, "2gs" },
+ { GUIO_RENDERATARIST, "atari" },
{ GUIO_GAMEOPTIONS1, "gameOption1" },
{ GUIO_GAMEOPTIONS2, "gameOption2" },
diff --git a/common/gui_options.h b/common/gui_options.h
index b608fa3..8394446 100644
--- a/common/gui_options.h
+++ b/common/gui_options.h
@@ -23,49 +23,49 @@
#ifndef COMMON_GUI_OPTIONS_H
#define COMMON_GUI_OPTIONS_H
-#define GUIO_NONE "\000"
-#define GUIO_NOSUBTITLES "\001"
-#define GUIO_NOMUSIC "\002"
-#define GUIO_NOSPEECH "\003"
-#define GUIO_NOSFX "\004"
-#define GUIO_NOMIDI "\005"
-#define GUIO_NOLAUNCHLOAD "\006"
+#define GUIO_NONE "\000"
+#define GUIO_NOSUBTITLES "\001"
+#define GUIO_NOMUSIC "\002"
+#define GUIO_NOSPEECH "\003"
+#define GUIO_NOSFX "\004"
+#define GUIO_NOMIDI "\005"
+#define GUIO_NOLAUNCHLOAD "\006"
-#define GUIO_MIDIPCSPK "\007"
-#define GUIO_MIDICMS "\010"
-#define GUIO_MIDIPCJR "\011"
-#define GUIO_MIDIADLIB "\012"
-#define GUIO_MIDIC64 "\013"
-#define GUIO_MIDIAMIGA "\014"
-#define GUIO_MIDIAPPLEIIGS "\015"
-#define GUIO_MIDITOWNS "\016"
-#define GUIO_MIDIPC98 "\017"
-#define GUIO_MIDIMT32 "\020"
-#define GUIO_MIDIGM "\021"
+#define GUIO_MIDIPCSPK "\007"
+#define GUIO_MIDICMS "\010"
+#define GUIO_MIDIPCJR "\011"
+#define GUIO_MIDIADLIB "\012"
+#define GUIO_MIDIC64 "\013"
+#define GUIO_MIDIAMIGA "\014"
+#define GUIO_MIDIAPPLEIIGS "\015"
+#define GUIO_MIDITOWNS "\016"
+#define GUIO_MIDIPC98 "\017"
+#define GUIO_MIDIMT32 "\020"
+#define GUIO_MIDIGM "\021"
-#define GUIO_NOASPECT "\022"
+#define GUIO_NOASPECT "\022"
-#define GUIO_RENDERHERCGREEN "\030"
-#define GUIO_RENDERHERCAMBER "\031"
-#define GUIO_RENDERCGA "\032"
-#define GUIO_RENDEREGA "\033"
-#define GUIO_RENDERVGA "\034"
-#define GUIO_RENDERAMIGA "\035"
-#define GUIO_RENDERFMTOWNS "\036"
-#define GUIO_RENDERPC9821 "\037"
-#define GUIO_RENDERPC9801 "\040"
-#define GUIO_RENDERAPPLE2GS "\041"
-#define GUIO_RENDERATARIST "\042"
+#define GUIO_RENDERHERCGREEN "\030"
+#define GUIO_RENDERHERCAMBER "\031"
+#define GUIO_RENDERCGA "\032"
+#define GUIO_RENDEREGA "\033"
+#define GUIO_RENDERVGA "\034"
+#define GUIO_RENDERAMIGA "\035"
+#define GUIO_RENDERFMTOWNS "\036"
+#define GUIO_RENDERPC9821 "\037"
+#define GUIO_RENDERPC9801 "\040"
+#define GUIO_RENDERAPPLE2GS "\041"
+#define GUIO_RENDERATARIST "\042"
// Special GUIO flags for the AdvancedDetector's caching of game specific
// options.
-#define GUIO_GAMEOPTIONS1 "\050"
-#define GUIO_GAMEOPTIONS2 "\051"
-#define GUIO_GAMEOPTIONS3 "\052"
-#define GUIO_GAMEOPTIONS4 "\053"
-#define GUIO_GAMEOPTIONS5 "\054"
-#define GUIO_GAMEOPTIONS6 "\055"
-#define GUIO_GAMEOPTIONS7 "\056"
+#define GUIO_GAMEOPTIONS1 "\050"
+#define GUIO_GAMEOPTIONS2 "\051"
+#define GUIO_GAMEOPTIONS3 "\052"
+#define GUIO_GAMEOPTIONS4 "\053"
+#define GUIO_GAMEOPTIONS5 "\054"
+#define GUIO_GAMEOPTIONS6 "\055"
+#define GUIO_GAMEOPTIONS7 "\056"
#define GUIO0() (GUIO_NONE)
#define GUIO1(a) (a)
diff --git a/common/rendermode.cpp b/common/rendermode.cpp
index 48a1932..6fa91fa 100644
--- a/common/rendermode.cpp
+++ b/common/rendermode.cpp
@@ -55,17 +55,17 @@ struct RenderGUIOMapping {
// could be used to indicate "any" mode when passed to renderMode2GUIO (if
// we wanted to merge allRenderModesGUIOs back into)
static const RenderGUIOMapping s_renderGUIOMapping[] = {
- { kRenderHercG, GUIO_RENDERHERCGREEN },
- { kRenderHercA, GUIO_RENDERHERCAMBER },
- { kRenderCGA, GUIO_RENDERCGA },
- { kRenderEGA, GUIO_RENDEREGA },
- { kRenderVGA, GUIO_RENDERVGA },
- { kRenderAmiga, GUIO_RENDERAMIGA },
- { kRenderFMTowns, GUIO_RENDERFMTOWNS },
- { kRenderPC9821, GUIO_RENDERPC9821 },
- { kRenderPC9801, GUIO_RENDERPC9801 },
- { kRenderApple2GS, GUIO_RENDERAPPLE2GS },
- { kRenderAtariST, GUIO_RENDERATARIST }
+ { kRenderHercG, GUIO_RENDERHERCGREEN },
+ { kRenderHercA, GUIO_RENDERHERCAMBER },
+ { kRenderCGA, GUIO_RENDERCGA },
+ { kRenderEGA, GUIO_RENDEREGA },
+ { kRenderVGA, GUIO_RENDERVGA },
+ { kRenderAmiga, GUIO_RENDERAMIGA },
+ { kRenderFMTowns, GUIO_RENDERFMTOWNS },
+ { kRenderPC9821, GUIO_RENDERPC9821 },
+ { kRenderPC9801, GUIO_RENDERPC9801 },
+ { kRenderApple2GS, GUIO_RENDERAPPLE2GS },
+ { kRenderAtariST, GUIO_RENDERATARIST }
};
DECLARE_TRANSLATION_ADDITIONAL_CONTEXT("Hercules Green", "lowres")
More information about the Scummvm-git-logs
mailing list