From 71699543ddacebc1cf629c91e1d23fbde1326ece Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Wed, 30 Oct 2019 21:35:22 +0100 Subject: [PATCH] Remove obsolete key label strings; update changelog. --- data/language/en-GB.txt | 128 -------------- distribution/changelog.txt | 1 + src/openrct2-ui/input/KeyboardShortcuts.cpp | 150 +++++----------- src/openrct2/localisation/StringIds.h | 180 +++++--------------- 4 files changed, 90 insertions(+), 369 deletions(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index a2adb5c5fe..f769bb2f74 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -1858,39 +1858,14 @@ STR_2521 :Show staff list STR_2522 :Show recent messages STR_2523 :Show map STR_2524 :Screenshot -### The following need to be reordered to match SDL_keycode layout. -STR_2525 :??? -STR_2526 :??? -STR_2527 :??? -STR_2528 :??? -STR_2529 :??? -STR_2530 :??? -STR_2531 :??? -STR_2532 :??? STR_2533 :Backspace STR_2534 :Tab -STR_2535 :??? -STR_2536 :??? STR_2537 :Clear STR_2538 :Return -STR_2539 :??? -STR_2540 :??? -STR_2541 :??? -STR_2542 :??? STR_2543 :Alt/Menu STR_2544 :Pause STR_2545 :Caps -STR_2546 :??? -STR_2547 :??? -STR_2548 :??? -STR_2549 :??? -STR_2550 :??? -STR_2551 :??? STR_2552 :Escape -STR_2553 :??? -STR_2554 :??? -STR_2555 :??? -STR_2556 :??? STR_2557 :Spacebar STR_2558 :PgUp STR_2559 :PgDn @@ -1907,54 +1882,7 @@ STR_2569 :Snapshot STR_2570 :Insert STR_2571 :Delete STR_2572 :Help -STR_2573 :0 -STR_2574 :1 -STR_2575 :2 -STR_2576 :3 -STR_2577 :4 -STR_2578 :5 -STR_2579 :6 -STR_2580 :7 -STR_2581 :8 -STR_2582 :9 -STR_2583 :??? -STR_2584 :??? -STR_2585 :??? -STR_2586 :??? -STR_2587 :??? -STR_2588 :??? -STR_2589 :??? -STR_2590 :A -STR_2591 :B -STR_2592 :C -STR_2593 :D -STR_2594 :E -STR_2595 :F -STR_2596 :G -STR_2597 :H -STR_2598 :I -STR_2599 :J -STR_2600 :K -STR_2601 :L -STR_2602 :M -STR_2603 :N -STR_2604 :O -STR_2605 :P -STR_2606 :Q -STR_2607 :R -STR_2608 :S -STR_2609 :T -STR_2610 :U -STR_2611 :V -STR_2612 :W -STR_2613 :X -STR_2614 :Y -STR_2615 :Z -STR_2616 :??? -STR_2617 :??? STR_2618 :Menu -STR_2619 :??? -STR_2620 :??? STR_2621 :NumPad 0 STR_2622 :NumPad 1 STR_2623 :NumPad 2 @@ -1967,53 +1895,11 @@ STR_2629 :NumPad 8 STR_2630 :NumPad 9 STR_2631 :NumPad * STR_2632 :NumPad + -STR_2633 :??? STR_2634 :NumPad - STR_2635 :NumPad . STR_2636 :NumPad / -STR_2637 :F1 -STR_2638 :F2 -STR_2639 :F3 -STR_2640 :F4 -STR_2641 :F5 -STR_2642 :F6 -STR_2643 :F7 -STR_2644 :F8 -STR_2645 :F9 -STR_2646 :F10 -STR_2647 :F11 -STR_2648 :F12 -STR_2649 :F13 -STR_2650 :F14 -STR_2651 :F15 -STR_2652 :F16 -STR_2653 :F17 -STR_2654 :F18 -STR_2655 :F19 -STR_2656 :F20 -STR_2657 :F21 -STR_2658 :F22 -STR_2659 :F23 -STR_2660 :F24 -STR_2661 :??? -STR_2662 :??? -STR_2663 :??? -STR_2664 :??? -STR_2665 :??? -STR_2666 :??? -STR_2667 :??? -STR_2668 :??? STR_2669 :NumLock STR_2670 :Scroll -STR_2671 :??? -STR_2672 :??? -STR_2673 :??? -STR_2674 :??? -STR_2675 :??? -STR_2676 :??? -STR_2677 :??? -STR_2678 :??? -STR_2679 :??? STR_2680 :All research complete STR_2681 :{MEDIUMFONT}{BLACK}Increases your money by {CURRENCY} STR_2684 :{SMALLFONT}{BLACK}Large group of guests arrive @@ -2029,9 +1915,6 @@ STR_2693 :Terrain: STR_2694 :Generate STR_2695 :Random terrain STR_2696 :Place trees -STR_2697 :??? -STR_2698 :??? -STR_2699 :??? STR_2700 :Autosave frequency: STR_2701 :Every minute STR_2702 :Every 5 minutes @@ -2043,13 +1926,6 @@ STR_2707 :Use system file browser STR_2708 :{WINDOW_COLOUR_1}Are you sure you want to overwrite {STRINGID}? STR_2709 :Overwrite STR_2710 :Type the name of the file. -STR_2711 :; -STR_2712 := -STR_2713 :, -STR_2714 :- -STR_2715 :. -STR_2716 :/ -STR_2717 :' STR_2718 :Up STR_2719 :New file STR_2720 :{UINT16}sec @@ -2076,10 +1952,6 @@ STR_2740 :RollerCoaster Tycoon 1 STR_2741 :RollerCoaster Tycoon 2 STR_2742 :css50.dat not found STR_2743 :Copy 'data/css17.dat' from your RCT1 installation to 'data/css50.dat' in your RCT2 installation, or make sure the path to RCT1 in the Advanced tab is correct. -STR_2744 :[ -STR_2745 :\ -STR_2746 :] -STR_2747 :” STR_2749 :My new scenario # New strings used in the cheats window previously these were ??? STR_2750 :Move all items to top diff --git a/distribution/changelog.txt b/distribution/changelog.txt index d86aa05f84..559f5f44d3 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -1,5 +1,6 @@ 0.2.4+ (in development) ------------------------------------------------------------------------ +- Change: [#1164] Use available translations for shortcut key bindings. 0.2.4 (2019-10-28) ------------------------------------------------------------------------ diff --git a/src/openrct2-ui/input/KeyboardShortcuts.cpp b/src/openrct2-ui/input/KeyboardShortcuts.cpp index bf6009a75e..f3273c15fb 100644 --- a/src/openrct2-ui/input/KeyboardShortcuts.cpp +++ b/src/openrct2-ui/input/KeyboardShortcuts.cpp @@ -27,6 +27,51 @@ using namespace OpenRCT2::Input; // Remove when the C calls are removed static KeyboardShortcuts* _instance; +static const std::map specialCharNames = { + { SDL_SCANCODE_BACKSPACE, STR_SHORTCUT_BACKSPACE }, + { SDL_SCANCODE_TAB, STR_SHORTCUT_TAB }, + { SDL_SCANCODE_CLEAR, STR_SHORTCUT_CLEAR }, + { SDL_SCANCODE_RETURN, STR_SHORTCUT_RETURN }, + { SDL_SCANCODE_LALT, STR_SHORTCUT_ALT }, + { SDL_SCANCODE_PAUSE, STR_SHORTCUT_PAUSE }, + { SDL_SCANCODE_CAPSLOCK, STR_SHORTCUT_CAPS }, + { SDL_SCANCODE_ESCAPE, STR_SHORTCUT_ESCAPE }, + { SDL_SCANCODE_SPACE, STR_SHORTCUT_SPACEBAR }, + { SDL_SCANCODE_PAGEUP, STR_SHORTCUT_PGUP }, + { SDL_SCANCODE_PAGEDOWN, STR_SHORTCUT_PGDN }, + { SDL_SCANCODE_END, STR_SHORTCUT_END }, + { SDL_SCANCODE_HOME, STR_SHORTCUT_HOME }, + { SDL_SCANCODE_LEFT, STR_SHORTCUT_LEFT }, + { SDL_SCANCODE_UP, STR_SHORTCUT_UP }, + { SDL_SCANCODE_RIGHT, STR_SHORTCUT_RIGHT }, + { SDL_SCANCODE_DOWN, STR_SHORTCUT_DOWN }, + { SDL_SCANCODE_SELECT, STR_SHORTCUT_SELECT }, + { SDL_SCANCODE_PRINTSCREEN, STR_SHORTCUT_PRINT }, + { SDL_SCANCODE_EXECUTE, STR_SHORTCUT_EXECUTE }, + { SDL_SCANCODE_SYSREQ, STR_SHORTCUT_SNAPSHOT }, + { SDL_SCANCODE_INSERT, STR_SHORTCUT_INSERT }, + { SDL_SCANCODE_DELETE, STR_SHORTCUT_DELETE }, + { SDL_SCANCODE_HELP, STR_SHORTCUT_HELP }, + { SDL_SCANCODE_APPLICATION, STR_SHORTCUT_MENU }, + { SDL_SCANCODE_KP_0, STR_SHORTCUT_NUMPAD_0 }, + { SDL_SCANCODE_KP_1, STR_SHORTCUT_NUMPAD_1 }, + { SDL_SCANCODE_KP_2, STR_SHORTCUT_NUMPAD_2 }, + { SDL_SCANCODE_KP_3, STR_SHORTCUT_NUMPAD_3 }, + { SDL_SCANCODE_KP_4, STR_SHORTCUT_NUMPAD_4 }, + { SDL_SCANCODE_KP_5, STR_SHORTCUT_NUMPAD_5 }, + { SDL_SCANCODE_KP_6, STR_SHORTCUT_NUMPAD_6 }, + { SDL_SCANCODE_KP_7, STR_SHORTCUT_NUMPAD_7 }, + { SDL_SCANCODE_KP_8, STR_SHORTCUT_NUMPAD_8 }, + { SDL_SCANCODE_KP_9, STR_SHORTCUT_NUMPAD_9 }, + { SDL_SCANCODE_KP_MULTIPLY, STR_SHORTCUT_NUMPAD_MULTIPLY }, + { SDL_SCANCODE_KP_PLUS, STR_SHORTCUT_NUMPAD_PLUS }, + { SDL_SCANCODE_KP_MINUS, STR_SHORTCUT_NUMPAD_MINUS }, + { SDL_SCANCODE_KP_PERIOD, STR_SHORTCUT_NUMPAD_PERIOD }, + { SDL_SCANCODE_KP_DIVIDE, STR_SHORTCUT_NUMPAD_DIVIDE }, + { SDL_SCANCODE_NUMLOCKCLEAR, STR_SHORTCUT_NUMLOCK }, + { SDL_SCANCODE_SCROLLLOCK, STR_SHORTCUT_SCROLL }, +}; + KeyboardShortcuts::KeyboardShortcuts(const std::shared_ptr& env) : _env(env) { @@ -155,111 +200,6 @@ std::string KeyboardShortcuts::GetShortcutString(int32_t shortcut) const String::Append(buffer, sizeof(buffer), formatBuffer); } - static const std::map specialCharNames = { - { SDL_SCANCODE_BACKSPACE, STR_SHORTCUT_BACKSPACE }, - { SDL_SCANCODE_TAB, STR_SHORTCUT_TAB }, - { SDL_SCANCODE_CLEAR, STR_SHORTCUT_CLEAR }, - { SDL_SCANCODE_RETURN, STR_SHORTCUT_RETURN }, - { SDL_SCANCODE_LALT, STR_SHORTCUT_ALT }, - { SDL_SCANCODE_PAUSE, STR_SHORTCUT_PAUSE }, - { SDL_SCANCODE_CAPSLOCK, STR_SHORTCUT_CAPS }, - { SDL_SCANCODE_ESCAPE, STR_SHORTCUT_ESCAPE }, - { SDL_SCANCODE_SPACE, STR_SHORTCUT_SPACEBAR }, - { SDL_SCANCODE_PAGEUP, STR_SHORTCUT_PGUP }, - { SDL_SCANCODE_PAGEDOWN, STR_SHORTCUT_PGDN }, - { SDL_SCANCODE_END, STR_SHORTCUT_END }, - { SDL_SCANCODE_HOME, STR_SHORTCUT_HOME }, - { SDL_SCANCODE_LEFT, STR_SHORTCUT_LEFT }, - { SDL_SCANCODE_UP, STR_SHORTCUT_UP }, - { SDL_SCANCODE_RIGHT, STR_SHORTCUT_RIGHT }, - { SDL_SCANCODE_DOWN, STR_SHORTCUT_DOWN }, - { SDL_SCANCODE_SELECT, STR_SHORTCUT_SELECT }, - { SDL_SCANCODE_PRINTSCREEN, STR_SHORTCUT_PRINT }, - { SDL_SCANCODE_EXECUTE, STR_SHORTCUT_EXECUTE }, - { SDL_SCANCODE_SYSREQ, STR_SHORTCUT_SNAPSHOT }, - { SDL_SCANCODE_INSERT, STR_SHORTCUT_INSERT }, - { SDL_SCANCODE_DELETE, STR_SHORTCUT_DELETE }, - { SDL_SCANCODE_HELP, STR_SHORTCUT_HELP }, - { SDL_SCANCODE_0, STR_SHORTCUT_0 }, - { SDL_SCANCODE_1, STR_SHORTCUT_1 }, - { SDL_SCANCODE_2, STR_SHORTCUT_2 }, - { SDL_SCANCODE_3, STR_SHORTCUT_3 }, - { SDL_SCANCODE_4, STR_SHORTCUT_4 }, - { SDL_SCANCODE_5, STR_SHORTCUT_5 }, - { SDL_SCANCODE_6, STR_SHORTCUT_6 }, - { SDL_SCANCODE_7, STR_SHORTCUT_7 }, - { SDL_SCANCODE_8, STR_SHORTCUT_8 }, - { SDL_SCANCODE_9, STR_SHORTCUT_9 }, - { SDL_SCANCODE_A, STR_SHORTCUT_A }, - { SDL_SCANCODE_B, STR_SHORTCUT_B }, - { SDL_SCANCODE_C, STR_SHORTCUT_C }, - { SDL_SCANCODE_D, STR_SHORTCUT_D }, - { SDL_SCANCODE_E, STR_SHORTCUT_E }, - { SDL_SCANCODE_F, STR_SHORTCUT_F }, - { SDL_SCANCODE_G, STR_SHORTCUT_G }, - { SDL_SCANCODE_H, STR_SHORTCUT_H }, - { SDL_SCANCODE_I, STR_SHORTCUT_I }, - { SDL_SCANCODE_J, STR_SHORTCUT_J }, - { SDL_SCANCODE_K, STR_SHORTCUT_K }, - { SDL_SCANCODE_L, STR_SHORTCUT_L }, - { SDL_SCANCODE_M, STR_SHORTCUT_M }, - { SDL_SCANCODE_N, STR_SHORTCUT_N }, - { SDL_SCANCODE_O, STR_SHORTCUT_O }, - { SDL_SCANCODE_P, STR_SHORTCUT_P }, - { SDL_SCANCODE_Q, STR_SHORTCUT_Q }, - { SDL_SCANCODE_R, STR_SHORTCUT_R }, - { SDL_SCANCODE_S, STR_SHORTCUT_S }, - { SDL_SCANCODE_T, STR_SHORTCUT_T }, - { SDL_SCANCODE_U, STR_SHORTCUT_U }, - { SDL_SCANCODE_V, STR_SHORTCUT_V }, - { SDL_SCANCODE_W, STR_SHORTCUT_W }, - { SDL_SCANCODE_X, STR_SHORTCUT_X }, - { SDL_SCANCODE_Y, STR_SHORTCUT_Y }, - { SDL_SCANCODE_Z, STR_SHORTCUT_Z }, - { SDL_SCANCODE_APPLICATION, STR_SHORTCUT_MENU }, - { SDL_SCANCODE_KP_0, STR_SHORTCUT_NUMPAD_0 }, - { SDL_SCANCODE_KP_1, STR_SHORTCUT_NUMPAD_1 }, - { SDL_SCANCODE_KP_2, STR_SHORTCUT_NUMPAD_2 }, - { SDL_SCANCODE_KP_3, STR_SHORTCUT_NUMPAD_3 }, - { SDL_SCANCODE_KP_4, STR_SHORTCUT_NUMPAD_4 }, - { SDL_SCANCODE_KP_5, STR_SHORTCUT_NUMPAD_5 }, - { SDL_SCANCODE_KP_6, STR_SHORTCUT_NUMPAD_6 }, - { SDL_SCANCODE_KP_7, STR_SHORTCUT_NUMPAD_7 }, - { SDL_SCANCODE_KP_8, STR_SHORTCUT_NUMPAD_8 }, - { SDL_SCANCODE_KP_9, STR_SHORTCUT_NUMPAD_9 }, - { SDL_SCANCODE_KP_MULTIPLY, STR_SHORTCUT_NUMPAD_MULTIPLY }, - { SDL_SCANCODE_KP_PLUS, STR_SHORTCUT_NUMPAD_PLUS }, - { SDL_SCANCODE_KP_MINUS, STR_SHORTCUT_NUMPAD_MINUS }, - { SDL_SCANCODE_KP_PERIOD, STR_SHORTCUT_NUMPAD_PERIOD }, - { SDL_SCANCODE_KP_DIVIDE, STR_SHORTCUT_NUMPAD_DIVIDE }, - { SDL_SCANCODE_F1, STR_SHORTCUT_F1 }, - { SDL_SCANCODE_F2, STR_SHORTCUT_F2 }, - { SDL_SCANCODE_F3, STR_SHORTCUT_F3 }, - { SDL_SCANCODE_F4, STR_SHORTCUT_F4 }, - { SDL_SCANCODE_F5, STR_SHORTCUT_F5 }, - { SDL_SCANCODE_F6, STR_SHORTCUT_F6 }, - { SDL_SCANCODE_F7, STR_SHORTCUT_F7 }, - { SDL_SCANCODE_F8, STR_SHORTCUT_F8 }, - { SDL_SCANCODE_F9, STR_SHORTCUT_F9 }, - { SDL_SCANCODE_F10, STR_SHORTCUT_F10 }, - { SDL_SCANCODE_F11, STR_SHORTCUT_F11 }, - { SDL_SCANCODE_F12, STR_SHORTCUT_F12 }, - { SDL_SCANCODE_F13, STR_SHORTCUT_F13 }, - { SDL_SCANCODE_F14, STR_SHORTCUT_F14 }, - { SDL_SCANCODE_F15, STR_SHORTCUT_F15 }, - { SDL_SCANCODE_F16, STR_SHORTCUT_F16 }, - { SDL_SCANCODE_F17, STR_SHORTCUT_F17 }, - { SDL_SCANCODE_F18, STR_SHORTCUT_F18 }, - { SDL_SCANCODE_F19, STR_SHORTCUT_F19 }, - { SDL_SCANCODE_F20, STR_SHORTCUT_F20 }, - { SDL_SCANCODE_F21, STR_SHORTCUT_F21 }, - { SDL_SCANCODE_F22, STR_SHORTCUT_F22 }, - { SDL_SCANCODE_F23, STR_SHORTCUT_F23 }, - { SDL_SCANCODE_F24, STR_SHORTCUT_F24 }, - { SDL_SCANCODE_NUMLOCKCLEAR, STR_SHORTCUT_NUMLOCK }, - { SDL_SCANCODE_SCROLLLOCK, STR_SHORTCUT_SCROLL }, - }; - SDL_Scancode scanCode = static_cast(shortcutKey & 0xFF); auto keyPair = specialCharNames.find(scanCode); if (keyPair != specialCharNames.end()) diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index 39ff2bb43d..67fa0658f9 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -1927,38 +1927,29 @@ enum STR_SHORTCUT_SHOW_RECENT_MESSAGES = 2522, STR_SHORTCUT_SHOW_MAP = 2523, STR_SHORTCUT_SCREENSHOT = 2524, - STR_SHORTCUT_UNKNOWN_2525 = 2525, - STR_SHORTCUT_UNKNOWN_2526 = 2526, - STR_SHORTCUT_UNKNOWN_2527 = 2527, - STR_SHORTCUT_UNKNOWN_2528 = 2528, - STR_SHORTCUT_UNKNOWN_2529 = 2529, - STR_SHORTCUT_UNKNOWN_2530 = 2530, - STR_SHORTCUT_UNKNOWN_2531 = 2531, - STR_SHORTCUT_UNKNOWN_2532 = 2532, + + // 2525--2532 unused + STR_SHORTCUT_BACKSPACE = 2533, STR_SHORTCUT_TAB = 2534, - STR_SHORTCUT_UNKNOWN_2535 = 2535, - STR_SHORTCUT_UNKNOWN_2536 = 2536, + + // 2535--2536 unused + STR_SHORTCUT_CLEAR = 2537, STR_SHORTCUT_RETURN = 2538, - STR_SHORTCUT_UNKNOWN_2539 = 2539, - STR_SHORTCUT_UNKNOWN_2540 = 2540, - STR_SHORTCUT_UNKNOWN_2541 = 2541, - STR_SHORTCUT_UNKNOWN_2542 = 2542, + + // 2539--2542 unused + STR_SHORTCUT_ALT = 2543, STR_SHORTCUT_PAUSE = 2544, STR_SHORTCUT_CAPS = 2545, - STR_SHORTCUT_UNKNOWN_2546 = 2546, - STR_SHORTCUT_UNKNOWN_2547 = 2547, - STR_SHORTCUT_UNKNOWN_2548 = 2548, - STR_SHORTCUT_UNKNOWN_2549 = 2549, - STR_SHORTCUT_UNKNOWN_2550 = 2550, - STR_SHORTCUT_UNKNOWN_2551 = 2551, + + // 2546--2551 unused + STR_SHORTCUT_ESCAPE = 2552, - STR_SHORTCUT_UNKNOWN_2553 = 2553, - STR_SHORTCUT_UNKNOWN_2554 = 2554, - STR_SHORTCUT_UNKNOWN_2555 = 2555, - STR_SHORTCUT_UNKNOWN_2556 = 2556, + + // 2553--2556 unused + STR_SHORTCUT_SPACEBAR = 2557, STR_SHORTCUT_PGUP = 2558, STR_SHORTCUT_PGDN = 2559, @@ -1975,54 +1966,13 @@ enum STR_SHORTCUT_INSERT = 2570, STR_SHORTCUT_DELETE = 2571, STR_SHORTCUT_HELP = 2572, - STR_SHORTCUT_0 = 2573, - STR_SHORTCUT_1 = 2574, - STR_SHORTCUT_2 = 2575, - STR_SHORTCUT_3 = 2576, - STR_SHORTCUT_4 = 2577, - STR_SHORTCUT_5 = 2578, - STR_SHORTCUT_6 = 2579, - STR_SHORTCUT_7 = 2580, - STR_SHORTCUT_8 = 2581, - STR_SHORTCUT_9 = 2582, - STR_SHORTCUT_UNKNOWN_2583 = 2583, - STR_SHORTCUT_UNKNOWN_2584 = 2584, - STR_SHORTCUT_UNKNOWN_2585 = 2585, - STR_SHORTCUT_UNKNOWN_2586 = 2586, - STR_SHORTCUT_UNKNOWN_2587 = 2587, - STR_SHORTCUT_UNKNOWN_2588 = 2588, - STR_SHORTCUT_UNKNOWN_2589 = 2589, - STR_SHORTCUT_A = 2590, - STR_SHORTCUT_B = 2591, - STR_SHORTCUT_C = 2592, - STR_SHORTCUT_D = 2593, - STR_SHORTCUT_E = 2594, - STR_SHORTCUT_F = 2595, - STR_SHORTCUT_G = 2596, - STR_SHORTCUT_H = 2597, - STR_SHORTCUT_I = 2598, - STR_SHORTCUT_J = 2599, - STR_SHORTCUT_K = 2600, - STR_SHORTCUT_L = 2601, - STR_SHORTCUT_M = 2602, - STR_SHORTCUT_N = 2603, - STR_SHORTCUT_O = 2604, - STR_SHORTCUT_P = 2605, - STR_SHORTCUT_Q = 2606, - STR_SHORTCUT_R = 2607, - STR_SHORTCUT_S = 2608, - STR_SHORTCUT_T = 2609, - STR_SHORTCUT_U = 2610, - STR_SHORTCUT_V = 2611, - STR_SHORTCUT_W = 2612, - STR_SHORTCUT_X = 2613, - STR_SHORTCUT_Y = 2614, - STR_SHORTCUT_Z = 2615, - STR_SHORTCUT_UNKNOWN_2616 = 2616, - STR_SHORTCUT_UNKNOWN_2617 = 2617, + + // 2573--2617 unused + STR_SHORTCUT_MENU = 2618, - STR_SHORTCUT_UNKNOWN_2619 = 2619, - STR_SHORTCUT_UNKNOWN_2620 = 2620, + + // 2619--2620 unused + STR_SHORTCUT_NUMPAD_0 = 2621, STR_SHORTCUT_NUMPAD_1 = 2622, STR_SHORTCUT_NUMPAD_2 = 2623, @@ -2035,53 +1985,20 @@ enum STR_SHORTCUT_NUMPAD_9 = 2630, STR_SHORTCUT_NUMPAD_MULTIPLY = 2631, STR_SHORTCUT_NUMPAD_PLUS = 2632, - STR_SHORTCUT_UNKNOWN_2633 = 2633, + + // 2633 unused + STR_SHORTCUT_NUMPAD_MINUS = 2634, STR_SHORTCUT_NUMPAD_PERIOD = 2635, STR_SHORTCUT_NUMPAD_DIVIDE = 2636, - STR_SHORTCUT_F1 = 2637, - STR_SHORTCUT_F2 = 2638, - STR_SHORTCUT_F3 = 2639, - STR_SHORTCUT_F4 = 2640, - STR_SHORTCUT_F5 = 2641, - STR_SHORTCUT_F6 = 2642, - STR_SHORTCUT_F7 = 2643, - STR_SHORTCUT_F8 = 2644, - STR_SHORTCUT_F9 = 2645, - STR_SHORTCUT_F10 = 2646, - STR_SHORTCUT_F11 = 2647, - STR_SHORTCUT_F12 = 2648, - STR_SHORTCUT_F13 = 2649, - STR_SHORTCUT_F14 = 2650, - STR_SHORTCUT_F15 = 2651, - STR_SHORTCUT_F16 = 2652, - STR_SHORTCUT_F17 = 2653, - STR_SHORTCUT_F18 = 2654, - STR_SHORTCUT_F19 = 2655, - STR_SHORTCUT_F20 = 2656, - STR_SHORTCUT_F21 = 2657, - STR_SHORTCUT_F22 = 2658, - STR_SHORTCUT_F23 = 2659, - STR_SHORTCUT_F24 = 2660, - STR_SHORTCUT_UNKNOWN_2661 = 2661, - STR_SHORTCUT_UNKNOWN_2662 = 2662, - STR_SHORTCUT_UNKNOWN_2663 = 2663, - STR_SHORTCUT_UNKNOWN_2664 = 2664, - STR_SHORTCUT_UNKNOWN_2665 = 2665, - STR_SHORTCUT_UNKNOWN_2666 = 2666, - STR_SHORTCUT_UNKNOWN_2667 = 2667, - STR_SHORTCUT_UNKNOWN_2668 = 2668, + + // 2637--2668 unused + STR_SHORTCUT_NUMLOCK = 2669, STR_SHORTCUT_SCROLL = 2670, - STR_SHORTCUT_UNKNOWN_2671 = 2671, - STR_SHORTCUT_UNKNOWN_2672 = 2672, - STR_SHORTCUT_UNKNOWN_2673 = 2673, - STR_SHORTCUT_UNKNOWN_2674 = 2674, - STR_SHORTCUT_UNKNOWN_2675 = 2675, - STR_SHORTCUT_UNKNOWN_2676 = 2676, - STR_SHORTCUT_UNKNOWN_2677 = 2677, - STR_SHORTCUT_UNKNOWN_2678 = 2678, - STR_SHORTCUT_UNKNOWN_2679 = 2679, + + // 2671--2679 unused + STR_RESEARCH_COMPLETED_AL = 2680, STR_CHEAT_5K_MONEY_TIP = 2681, // STR_2682 : @@ -2099,9 +2016,9 @@ enum STR_MAPGEN_ACTION_GENERATE = 2694, STR_MAPGEN_OPTION_RANDOM_TERRAIN = 2695, STR_MAPGEN_OPTION_PLACE_TREES = 2696, - // STR_2697 :??? - // STR_2698 :??? - // STR_2699 :??? + + // 2697--2699 unused + STR_OPTIONS_AUTOSAVE_FREQUENCY_LABEL = 2700, STR_SAVE_EVERY_MINUTE = 2701, STR_SAVE_EVERY_5MINUTES = 2702, @@ -2113,13 +2030,9 @@ enum STR_FILEBROWSER_OVERWRITE_PROMPT = 2708, STR_FILEBROWSER_OVERWRITE_TITLE = 2709, STR_FILEBROWSER_FILE_NAME_PROMPT = 2710, - // STR_2711 :; - // STR_2712 := - // STR_2713 :, - // STR_2714 :- - // STR_2715 :. - // STR_2716 :/ - // STR_2717 :' + + // 2711--2717 unused + STR_FILEBROWSER_ACTION_UP = 2718, STR_FILEBROWSER_ACTION_NEW_FILE = 2719, STR_DURATION_SEC = 2720, @@ -2146,11 +2059,9 @@ enum STR_ROLLERCOASTER_TYCOON_2_DROPDOWN = 2741, STR_OPTIONS_MUSIC_ERR_CSS50_NOT_FOUND = 2742, STR_OPTIONS_MUSIC_ERR_CSS50_NOT_FOUND_HINT = 2743, - // STR_2744 :[ - // STR_2745 :\ - // STR_2746 :] - // STR_2747 :{ENDQUOTES} - // STR_2748 :Bar + + // 2744--2748 unused + STR_MY_NEW_SCENARIO = 2749, STR_MOVE_ALL_TOP = 2750, STR_MOVE_ALL_BOTTOM = 2751, @@ -2159,14 +2070,9 @@ enum STR_CHEAT_WATER_PLANTS = 2754, STR_CHEAT_FIX_VANDALISM = 2755, STR_CHEAT_REMOVE_LITTER = 2756, - // STR_CHEAT_FORCE_SUN = 2757, // - // STR_CHEAT_FORCE_THUNDER = 2758, // - // STR_CHEAT_ZERO_CLEARANCE = 2759, // - // STR_CHEAT_5K_MONEY = 2760, // - // STR_2761 : - // STR_2762 : - // STR_2763 :??? - // STR_2764 : + + // 2757--2764 unused + STR_CHEAT_LARGE_TRAM_GUESTS = 2765, STR_CHEAT_WIN_SCENARIO = 2766, STR_CHEAT_FREEZE_WEATHER = 2767, @@ -2702,6 +2608,8 @@ enum STR_SET_PATROL_AREA = 3445, STR_CLEAR_PATROL_AREA = 3446, + // 3447--5119 unused + STR_OPENRCT2_BEGIN_STRING_ID = 5120, STR_FINANCES_BUTTON_ON_TOOLBAR = 5120,