mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00
Code Issues Releases Wiki Activity

Merge with develop

Browse Source
This commit is contained in:
Maikel Stuivenberg
2015-06-28 21:40:01 +02:00
parent 952cbdebaf 2c3c8dc188
commit 36b9d8de8a
60 changed files with 10746 additions and 1203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

217
src/localisation/string_ids.h
View File

@@ -73,7 +73,7 @@ enum {
STR_CLOSE_X = 824,
STR_CHOSEN_NAME_IN_USE_ALREADY = 825,
STR_TOO_MANY_NAMES_DEFINED = 826,
STR_NOT_ENOUGH_CASH_REQUIRES = 827,
STR_CLOSE_WINDOW_TIP = 828,
STR_WINDOW_TITLE_TIP = 829,
@@ -124,6 +124,45 @@ enum {
STR_SCREENSHOT_FAILED = 893,
STR_CANT_BUILD_PARTLY_ABOVE_AND_PARTLY_BELOW_GROUND = 895,
STR_RIDE_CONSTRUCTION_DIRECTION = 897,
STR_RIDE_CONSTRUCTION_LEFT_CURVE_TIP = 898,
STR_RIDE_CONSTRUCTION_RIGHT_CURVE_TIP = 899,
STR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL_TIP = 900,
STR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL_TIP = 901,
STR_RIDE_CONSTRUCTION_LEFT_CURVE_VERY_SMALL_TIP = 902,
STR_RIDE_CONSTRUCTION_RIGHT_CURVE_VERY_SMALL_TIP = 903,
STR_RIDE_CONSTRUCTION_LEFT_CURVE_LARGE_TIP = 904,
STR_RIDE_CONSTRUCTION_RIGHT_CURVE_LARGE_TIP = 905,
STR_RIDE_CONSTRUCTION_STRAIGHT_TIP = 906,
STR_RIDE_CONSTRUCTION_SLOPE = 907,
STR_RIDE_CONSTRUCTION_ROLL_BANKING = 908,
STR_RIDE_CONSTRUCTION_SEAT_ROT = 909,
STR_RIDE_CONSTRUCTION_ROLL_FOR_LEFT_CURVE_TIP = 910,
STR_RIDE_CONSTRUCTION_ROLL_FOR_RIGHT_CURVE_TIP = 911,
STR_RIDE_CONSTRUCTION_NO_ROLL_TIP = 912,
STR_RIDE_CONSTRUCTION_MOVE_TO_PREVIOUS_SECTION_TIP = 913,
STR_RIDE_CONSTRUCTION_MOVE_TO_NEXT_SECTION_TIP = 914,
STR_RIDE_CONSTRUCTION_CONSTRUCT_SELECTED_SECTION_TIP = 915,
STR_RIDE_CONSTRUCTION_REMOVE_HIGHLIGHTED_SECTION_TIP = 916,
STR_RIDE_CONSTRUCTION_VERTICAL_DROP_TIP = 917,
STR_RIDE_CONSTRUCTION_STEEP_SLOPE_DOWN_TIP = 918,
STR_RIDE_CONSTRUCTION_SLOPE_DOWN_TIP = 919,
STR_RIDE_CONSTRUCTION_LEVEL_TIP = 920,
STR_RIDE_CONSTRUCTION_SLOPE_UP_TIP = 921,
STR_RIDE_CONSTRUCTION_STEEP_SLOPE_UP_TIP = 922,
STR_RIDE_CONSTRUCTION_VERTICAL_RISE_TIP = 923,
STR_RIDE_CONSTRUCTION_HELIX_DOWN_TIP = 924,
STR_RIDE_CONSTRUCTION_HELIX_UP_TIP = 925,
STR_RIDE_CONSTRUCTION_CANT_REMOVE_THIS = 926,
STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE = 927,
STR_RIDE_CONSTRUCTION_CHAIN_LIFT_TIP = 928,
STR_S_BEND_LEFT = 929,
STR_S_BEND_RIGHT = 930,
STR_VERTICAL_LOOP_LEFT = 931,
STR_VERTICAL_LOOP_RIGHT = 932,
STR_VIEW_OPTIONS_TIP = 937,
STR_ADJUST_LAND_TIP = 938,
STR_UNDERGROUND_VIEW = 939,
@@ -145,6 +184,24 @@ enum {
STR_QUIT_GAME_2_PROMPT_TITLE = 952,
STR_LOAD_LANDSCAPE_PROMPT_TITLE = 953,
STR_RIDE_CONSTRUCTION_SELECT_SEAT_ROTATION_ANGLE_TIP = 955,
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_NEG_180 = 956,
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_NEG_135 = 957,
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_NEG_90 = 958,
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_NEG_45 = 959,
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_0 = 960,
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_45 = 961,
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_90 = 962,
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_135 = 963,
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_180 = 964,
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_225 = 965,
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_270 = 966,
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_315 = 967,
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_360 = 968,
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_405 = 969,
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_450 = 970,
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_495 = 971,
STR_CANCEL = 972,
STR_OK = 973,
@@ -166,6 +223,8 @@ enum {
STR_CONSTRUCTION = 990,
STR_STATION_PLATFORM = 991,
STR_DEMOLISH_RIDE_TIP = 992,
STR_DEMOLISH_RIDE = 993,
STR_DEMOLISH = 994,
@@ -197,6 +256,11 @@ enum {
STR_LOCATE_SUBJECT_TIP = 1027,
STR_OFF_EDGE_OF_MAP = 1028,
STR_CANNOT_BUILD_PARTLY_ABOVE_AND_PARTLY_BELOW_WATER = 1029,
STR_CAN_ONLY_BUILD_THIS_UNDERWATER = 1030,
STR_RIDE_CANT_BUILD_THIS_UNDERWATER = 1031,
STR_CAN_ONLY_BUILD_THIS_ON_WATER = 1032,
STR_CAN_ONLY_BUILD_THIS_ABOVE_GROUND = 1033,
STR_CAN_ONLY_BUILD_THIS_ON_LAND = 1034,
STR_LOAD_GAME_DIALOG_TITLE = 1036,
@@ -304,6 +368,11 @@ enum {
STR_SELECT_VEHICLE_COLOUR_SCHEME_TIP = 1140,
STR_SELECT_VEHICLE_TO_MODIFY_TIP = 1141,
STR_CANT_BUILD_MOVE_ENTRANCE_FOR_THIS_RIDE_ATTRACTION = 1144,
STR_CANT_BUILD_MOVE_EXIT_FOR_THIS_RIDE_ATTRACTION = 1145,
STR_ENTRANCE_NOT_YET_BUILT = 1146,
STR_EXIT_NOT_YET_BUILT = 1147,
STR_QUARTER_LOAD = 1148,
STR_HALF_LOAD = 1149,
STR_THREE_QUARTER_LOAD = 1150,
@@ -411,6 +480,31 @@ enum {
STR_QUEUE_TIME_MINUTE = 1359,
STR_QUEUE_TIME_MINUTES = 1360,
STR_TOO_HIGH_FOR_SUPPORTS = 1363,
STR_IN_LINE_TWIST_LEFT = 1365,
STR_IN_LINE_TWIST_RIGHT = 1366,
STR_HALF_LOOP = 1367,
STR_HALF_CORKSCREW_LEFT = 1368,
STR_HALF_CORKSCREW_RIGHT = 1369,
STR_BARREL_ROLL_LEFT = 1370,
STR_BARREL_ROLL_RIGHT = 1371,
STR_LAUNCHED_LIFT_HILL = 1372,
STR_LARGE_HALF_LOOP_LEFT = 1373,
STR_LARGE_HALF_LOOP_RIGHT = 1374,
STR_UPPER_TRANSFER = 1375,
STR_LOWER_TRANSFER = 1376,
STR_HEARTLINE_ROLL_LEFT = 1377,
STR_HEARTLINE_ROLL_RIGHT = 1378,
STR_REVERSER_LEFT = 1379,
STR_REVERSER_RIGHT = 1380,
STR_CURVED_LIFT_HILL_LEFT = 1381,
STR_CURVED_LIFT_HILL_RIGHT = 1382,
STR_QUARTER_LOOP = 1383,
STR_RIDE_CONSTRUCTION_OTHER_TRACK_CONFIGURATIONS_TIP = 1385,
STR_RIDE_CONSTRUCTION_SPECIAL = 1386,
STR_VIEW_OF_RIDE_ATTRACTION_TIP = 1392,
STR_VEHICLE_DETAILS_AND_OPTIONS_TIP = 1393,
STR_OPERATING_OPTIONS_TIP = 1394,
@@ -420,6 +514,10 @@ enum {
STR_MEASUREMENTS_AND_TEST_DATA_TIP = 1398,
STR_GRAPHS_TIP = 1399,
STR_RIDE_CONSTRUCTION_ENTRANCE = 1400,
STR_RIDE_CONSTRUCTION_EXIT = 1401,
STR_RIDE_CONSTRUCTION_ENTRANCE_TIP = 1402,
STR_RIDE_CONSTRUCTION_EXIT_TIP = 1403,
STR_ROTATE_90_TIP = 1404,
STR_MIRROR_IMAGE_TIP = 1405,
STR_TOGGLE_SCENERY_TIP = 1406,
@@ -427,6 +525,9 @@ enum {
STR_BUILD_THIS = 1407,
STR_COST_LABEL = 1408,
STR_ENTRY_EXIT_PLATFORM = 1409,
STR_VERTICAL_TOWER = 1410,
STR_DATA_LOGGING_NOT_AVAILABLE_FOR_THIS_TYPE_OF_RIDE = 1412,
STR_DATA_LOGGING_WILL_START_WHEN_NEXT_LEAVES = 1413,
STR_LOGGING_DATA_FROM_TIP = 1422,
@@ -455,9 +556,20 @@ enum {
STR_LOOKING_AT_SCENERY = 1446,
STR_LEAVING_PARK = 1447,
STR_WATCHING_NEW_RIDE_BEING_CONSTRUCTED = 1448,
STR_RIDE_CONSTRUCTION_TRACK_STYLE = 1459,
STR_RIDE_CONSTRUCTION_U_SHAPED_OPEN_TRACK_TIP = 1460,
STR_RIDE_CONSTRUCTION_O_SHAPED_ENCLOSED_TRACK_TIP = 1461,
STR_TOO_STEEP_FOR_LIFT_HILL = 1462,
STR_GUESTS = 1463,
STR_HELIX_UP_SMALL = 1464,
STR_HELIX_UP_LARGE = 1465,
STR_HELIX_DOWN_SMALL = 1466,
STR_HELIX_DOWN_LARGE = 1467,
STR_STAFF = 1468,
STR_RIDE_MUST_START_AND_END_WITH_STATIONS = 1469,
@@ -484,9 +596,27 @@ enum {
STR_TOTAL_CUSTOMERS = 1670,
STR_TOTAL_PROFIT = 1671,
STR_BRAKES = 1672,
STR_SPINNING_CONTROL_TOGGLE_TRACK = 1673,
STR_RIDE_CONSTRUCTION_BRAKE_SPEED = 1674,
STR_RIDE_CONSTRUCTION_BRAKE_SPEED_LIMIT_TIP = 1676,
STR_POPULARITY_UNKNOWN = 1677,
STR_POPULARITY_PERCENT = 1678,
STR_HELIX_UP_LEFT = 1679,
STR_HELIX_UP_RIGHT = 1680,
STR_HELIX_DOWN_LEFT = 1681,
STR_HELIX_DOWN_RIGHT = 1682,
STR_BASE_SIZE_2_X_2 = 1683,
STR_BASE_SIZE_4_X_4 = 1684,
STR_BASE_SIZE_2_X_4 = 1685,
STR_BASE_SIZE_5_X_1 = 1686,
STR_WATER_SPLASH = 1687,
STR_BASE_SIZE_4_X_1 = 1688,
STR_BLOCK_BRAKES = 1689,
STR_GUESTS_TIP = 1693,
STR_STAFF_TIP = 1694,
@@ -523,6 +653,9 @@ enum {
STR_BANNER_TEXT = 1731,
STR_RIDE_CONSTRUCTION_BUILD = 1732,
STR_RIDE_CONSTRUCTION_MODE = 1733,
STR_NUMBER_OF_LAPS = 1734,
STR_NUMBER_OF_LAPS_TIP = 1735,
@@ -542,9 +675,24 @@ enum {
STR_ADMISSION_PRICE = 1756,
STR_RELIABILITY_LABEL_1757 = 1757,
STR_RIDE_CONSTRUCTION_BUILD_MODE = 1758,
STR_RIDE_CONSTRUCTION_MOVE_MODE = 1759,
STR_RIDE_CONSTRUCTION_FILL_IN_MODE = 1760,
STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP = 1761,
STR_WATERFALLS = 1762,
STR_RAPIDS = 1763,
STR_LOG_BUMPS = 1764,
STR_ON_RIDE_PHOTO_SECTION = 1765,
STR_REVERSER_TURNTABLE = 1766,
STR_SPINNING_TUNNEL = 1767,
STR_NUMBER_OF_SWINGS = 1769,
STR_NUMBER_OF_SWINGS_TIP = 1770,
STR_ONLY_ONE_ON_RIDE_PHOTO_PER_RIDE = 1773,
STR_ONLY_ONE_CABLE_LIFT_HILL_PER_RIDE = 1774,
STR_OFF = 1775,
STR_ON = 1776,
STR_MUSIC = 1777,
@@ -557,6 +705,8 @@ enum {
STR_ANSWERING_RADIO_CALL = 1795,
STR_HAS_BROKEN_DOWN_AND_REQUIRES_FIXING = 1796,
STR_WHIRLPOOL = 1798,
STR_SAFETY_CUT_OUT = 1800,
STR_RESTRAINTS_STUCK_CLOSED = 1801,
STR_RESTRAINTS_STUCK_OPEN = 1802,
@@ -735,6 +885,11 @@ enum {
STR_COMPANY_VALUE_LABEL = 2227,
STR_LAST_MONTH_PROFIT_FROM_FOOD_DRINK_MERCHANDISE_SALES_LABEL = 2228,
STR_SLOPE_UP_TO_VERTICAL = 2229,
STR_VERTICAL_TRACK = 2230,
STR_HOLDING_BRAKE_FOR_DROP = 2231,
STR_CABLE_LIFT_HILL = 2232,
STR_PARK_INFORMATION_TIP = 2233,
STR_RECENT_MESSAGES = 2234,
@@ -991,11 +1146,52 @@ enum {
STR_REAL_NAME_TIP = 2488,
STR_HOTKEY = 2489,
STR_SHORTCUT_DESCRIPTION_0 = 2493,
STR_SHORTCUT_CLOSE_TOP_MOST_WINDOW = 2493,
STR_SHORTCUT_CLOSE_ALL_FLOATING_WINDOWS = 2494,
STR_SHORTCUT_CANCEL_CONSTRUCTION_MODE = 2495,
STR_SHORTCUT_PAUSE_GAME = 2496,
STR_SHORTCUT_ZOOM_VIEW_OUT = 2497,
STR_SHORTCUT_ZOOM_VIEW_IN = 2498,
STR_SHORTCUT_ROTATE_VIEW = 2499,
STR_SHORTCUT_ROTATE_CONSTRUCTION_OBJECT = 2500,
STR_SHORTCUT_UNDERGROUND_VIEW_TOGGLE = 2501,
STR_SHORTCUT_REMOVE_BASE_LAND_TOGGLE = 2502,
STR_SHORTCUT_REMOVE_VERTICAL_LAND_TOGGLE = 2503,
STR_SHORTCUT_SEE_THROUGH_RIDES_TOGGLE = 2504,
STR_SHORTCUT_SEE_THROUGH_SCENERY_TOGGLE = 2505,
STR_SHORTCUT_INVISIBLE_SUPPORTS_TOGGLE = 2506,
STR_SHORTCUT_INVISIBLE_PEOPLE_TOGGLE = 2507,
STR_SHORTCUT_HEIGHT_MARKS_ON_LAND_TOGGLE = 2508,
STR_SHORTCUT_HEIGHT_MARKS_ON_RIDE_TRACKS_TOGGLE = 2509,
STR_SHORTCUT_HEIGHT_MARKS_ON_PATHS_TOGGLE = 2510,
STR_SHORTCUT_ADJUST_LAND = 2511,
STR_SHORTCUT_ADJUST_WATER = 2512,
STR_SHORTCUT_BUILD_SCENERY = 2513,
STR_SHORTCUT_BUILD_PATHS = 2514,
STR_SHORTCUT_BUILD_NEW_RIDE = 2515,
STR_SHORTCUT_SHOW_FINANCIAL_INFORMATION = 2516,
STR_SHORTCUT_SHOW_RESEARCH_INFORMATION = 2517,
STR_SHORTCUT_SHOW_RIDES_LIST = 2518,
STR_SHORTCUT_SHOW_PARK_INFORMATION = 2519,
STR_SHORTCUT_SHOW_GUEST_LIST = 2520,
STR_SHORTCUT_SHOW_STAFF_LIST = 2521,
STR_SHORTCUT_SHOW_RECENT_MESSAGES = 2522,
STR_SHORTCUT_SHOW_MAP = 2523,
STR_SHORTCUT_SCREENSHOT = 2524,
STR_SHORTCUT_DESCRIPTION_31 = 2524,
STR_INDIVIDUAL_KEYS_BASE = 2525,
STR_GOLF_HOLE_A = 3049,
STR_GOLF_HOLE_B = 3050,
STR_GOLF_HOLE_C = 3051,
STR_GOLF_HOLE_D = 3052,
STR_GOLF_HOLE_E = 3053,
STR_TOP_SECTION = 3069,
STR_SLOPE_TO_LEVEL = 3070,
STR_NOT_ALLOWED_TO_MODIFY_STATION = 3092,
// Cheats
STR_CHEAT_TITLE = 5217,
STR_CHEAT_TITLE_FINANCIAL = 5345,
@@ -1221,6 +1417,9 @@ enum {
STR_HEDGES = 3059,
STR_ICE_BLOCKS = 3060,
STR_WOODEN_FENCES = 3061,
STR_RIDE_CONSTRUCTION_STANDARD_RC_TRACK_TIP = 3062,
STR_RIDE_CONSTRUCTION_WATER_CHANNEL_TIP = 3063,
STR_BEGINNER_PARKS = 3064,
STR_CHALLENGING_PARKS = STR_BEGINNER_PARKS + 1,
@@ -1551,6 +1750,16 @@ enum {
STR_UP = 5375,
STR_DOWN = 5376,
STR_FORCE_PARK_RATING = 5442,
STR_OBJECTS_SORT_TYPE = 5447,
STR_OBJECTS_SORT_RIDE = 5448,
STR_SHORTCUT_REDUCE_GAME_SPEED = 5449,
STR_SHORTCUT_INCREASE_GAME_SPEED = 5450,
STR_SHORTCUT_OPEN_CHEATS_WINDOW = 5451,
STR_SHORTCUT_TOGGLE_VISIBILITY_OF_TOOLBARS = 5452,
// Have to include resource strings (from scenarios and objects) for the time being now that language is partially working
STR_COUNT = 32768
};