diff options
| author | Matthew Hoops | 2011-05-03 17:17:27 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-03 17:25:41 -0400 |
| commit | 9cb600099f4c29298707787cafad2741a1cd6686 (patch) | |
| tree | fb1930fa56b611317831d66442cba19b18d2e57a /engines/scumm/help.cpp | |
| parent | 3b2283daf850605ca897002afbafe44489c35473 (diff) | |
| parent | 95a6098f672191dc0792bd4f9bfa18706bbe8e3a (diff) | |
| download | scummvm-rg350-9cb600099f4c29298707787cafad2741a1cd6686.tar.gz scummvm-rg350-9cb600099f4c29298707787cafad2741a1cd6686.tar.bz2 scummvm-rg350-9cb600099f4c29298707787cafad2741a1cd6686.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/scumm/help.cpp')
| -rw-r--r-- | engines/scumm/help.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engines/scumm/help.cpp b/engines/scumm/help.cpp index 3738ebc2e5..a3bb85ab42 100644 --- a/engines/scumm/help.cpp +++ b/engines/scumm/help.cpp @@ -79,14 +79,14 @@ void ScummHelp::updateStrings(byte gameId, byte version, Common::Platform platfo ADD_BIND(".", _("Skip line of text")); ADD_BIND(_("Esc"), _("Skip cutscene")); ADD_BIND(_("Space"), _("Pause game")); - ADD_BIND(_("Ctrl 0-9"), _("Load game state 1-10")); - ADD_BIND(_("Alt 0-9"), _("Save game state 1-10")); + ADD_BIND(String(_("Ctrl")) + " 0-9", _("Load game state 1-10")); + ADD_BIND(String(_("Alt")) + " 0-9", _("Save game state 1-10")); #ifdef MACOSX ADD_BIND("Cmd q", _("Quit")); #else - ADD_BIND(_("Alt x, Ctrl z"), _("Quit")); + ADD_BIND(String(_("Alt")) + " x, " + _("Ctrl") + " z", _("Quit")); #endif - ADD_BIND(_("Alt Enter"), _("Toggle fullscreen")); + ADD_BIND(String(_("Alt")) + " " + _("Enter"), _("Toggle fullscreen")); ADD_BIND("[, ]", _("Music volume up / down")); ADD_BIND("-, +", _("Text speed slower / faster")); ADD_BIND(_("Enter"), _("Simulate left mouse button")); @@ -95,14 +95,14 @@ void ScummHelp::updateStrings(byte gameId, byte version, Common::Platform platfo case 2: title = _("Special keyboard commands:"); ADD_BIND("~, #", _("Show / Hide console")); - ADD_BIND(_("Ctrl d"), _("Start the debugger")); - ADD_BIND(_("Ctrl s"), _("Show memory consumption")); - ADD_BIND(_("Ctrl f"), _("Run in fast mode (*)")); - ADD_BIND(_("Ctrl g"), _("Run in really fast mode (*)")); - ADD_BIND(_("Ctrl m"), _("Toggle mouse capture")); - ADD_BIND(_("Ctrl Alt 1-8"), _("Switch between graphics filters")); - ADD_BIND(_("Ctrl Alt +, -"), _("Increase / Decrease scale factor")); - ADD_BIND(_("Ctrl Alt a"), _("Toggle aspect-ratio correction")); + ADD_BIND(String(_("Ctrl")) + " d", _("Start the debugger")); + ADD_BIND(String(_("Ctrl")) + " s", _("Show memory consumption")); + ADD_BIND(String(_("Ctrl")) + " f", _("Run in fast mode (*)")); + ADD_BIND(String(_("Ctrl")) + " g", _("Run in really fast mode (*)")); + ADD_BIND(String(_("Ctrl")) + " m", _("Toggle mouse capture")); + ADD_BIND(String(_("Ctrl")) + " " + _("Alt") + " 1-8", _("Switch between graphics filters")); + ADD_BIND(String(_("Ctrl")) + " " + _("Alt") + " +, -", _("Increase / Decrease scale factor")); + ADD_BIND(String(_("Ctrl")) + " " + _("Alt") + " a", _("Toggle aspect-ratio correction")); ADD_LINE; ADD_LINE; // FIXME: This should use word-wrapping, and should not assume |