From 11f21917d666dc48763dabedecfeec147c73491d Mon Sep 17 00:00:00 2001 From: alberth Date: Sun, 6 May 2012 14:56:13 +0000 Subject: (svn r24206) -Codechange: Move colouring of advanced setting options to the drawing code. --- src/lang/english.txt | 308 +++++++++++++++++++++-------------------- src/settings_gui.cpp | 20 ++- src/table/company_settings.ini | 6 + src/table/settings.ini | 30 ++++ 4 files changed, 202 insertions(+), 162 deletions(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index 1fdc47d53..2986e6f56 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1118,244 +1118,251 @@ STR_CONFIG_SETTING_HORIZONTAL_POS_LEFT :Left STR_CONFIG_SETTING_HORIZONTAL_POS_CENTER :Centre STR_CONFIG_SETTING_HORIZONTAL_POS_RIGHT :Right -STR_CONFIG_SETTING_BUILDONSLOPES :{LTBLUE}Allow building on slopes and coasts: {ORANGE}{STRING1} -STR_CONFIG_SETTING_AUTOSLOPE :{LTBLUE}Allow landscaping under buildings, tracks, etc. (autoslope): {ORANGE}{STRING1} -STR_CONFIG_SETTING_CATCHMENT :{LTBLUE}Allow more realistically sized catchment areas: {ORANGE}{STRING1} -STR_CONFIG_SETTING_EXTRADYNAMITE :{LTBLUE}Allow removal of more town-owned roads, bridges and tunnels: {ORANGE}{STRING1} -STR_CONFIG_SETTING_TRAIN_LENGTH :{LTBLUE}Maximum length of trains: {ORANGE}{STRING1} tile{P 0:1 "" s} -STR_CONFIG_SETTING_SMOKE_AMOUNT :{LTBLUE}Amount of vehicle smoke/sparks: {ORANGE}{STRING1} -STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL :{LTBLUE}Train acceleration model: {ORANGE}{STRING1} -STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL :{LTBLUE}Road vehicle acceleration model: {ORANGE}{STRING1} -STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS :{LTBLUE}Slope steepness for trains: {ORANGE}{STRING1}% -STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS :{LTBLUE}Slope steepness for road vehicles: {ORANGE}{STRING1}% -STR_CONFIG_SETTING_FORBID_90_DEG :{LTBLUE}Forbid trains and ships from making 90° turns: {ORANGE}{STRING1} -STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS :{LTBLUE}Allow to join stations not directly adjacent: {ORANGE}{STRING1} -STR_CONFIG_SETTING_IMPROVEDLOAD :{LTBLUE}Use improved loading algorithm: {ORANGE}{STRING1} -STR_CONFIG_SETTING_GRADUAL_LOADING :{LTBLUE}Load vehicles gradually: {ORANGE}{STRING1} -STR_CONFIG_SETTING_INFLATION :{LTBLUE}Inflation: {ORANGE}{STRING1} -STR_CONFIG_SETTING_SELECTGOODS :{LTBLUE}Deliver cargo to a station only when there is a demand: {ORANGE}{STRING1} -STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH :{LTBLUE}Maximum bridge length: {ORANGE}{STRING1} tile{P 0:1 "" s} -STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH :{LTBLUE}Maximum tunnel length: {ORANGE}{STRING1} tile{P 0:1 "" s} -STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD :{LTBLUE}Manual primary industry construction method: {ORANGE}{STRING1} +STR_CONFIG_SETTING_BUILDONSLOPES :Allow building on slopes and coasts: {STRING2} +STR_CONFIG_SETTING_AUTOSLOPE :Allow landscaping under buildings, tracks, etc. (autoslope): {STRING2} +STR_CONFIG_SETTING_CATCHMENT :Allow more realistically sized catchment areas: {STRING2} +STR_CONFIG_SETTING_EXTRADYNAMITE :Allow removal of more town-owned roads, bridges and tunnels: {STRING2} +STR_CONFIG_SETTING_TRAIN_LENGTH :Maximum length of trains: {STRING2} +STR_CONFIG_SETTING_TILE_LENGTH :{COMMA} tile{P 0 "" s} +STR_CONFIG_SETTING_SMOKE_AMOUNT :Amount of vehicle smoke/sparks: {STRING2} +STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL :Train acceleration model: {STRING2} +STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL :Road vehicle acceleration model: {STRING2} +STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS :Slope steepness for trains: {STRING2} +STR_CONFIG_SETTING_PERCENTAGE :{COMMA}% +STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS :Slope steepness for road vehicles: {STRING2} +STR_CONFIG_SETTING_FORBID_90_DEG :Forbid trains and ships from making 90° turns: {STRING2} +STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS :Allow to join stations not directly adjacent: {STRING2} +STR_CONFIG_SETTING_IMPROVEDLOAD :Use improved loading algorithm: {STRING2} +STR_CONFIG_SETTING_GRADUAL_LOADING :Load vehicles gradually: {STRING2} +STR_CONFIG_SETTING_INFLATION :Inflation: {STRING2} +STR_CONFIG_SETTING_SELECTGOODS :Deliver cargo to a station only when there is a demand: {STRING2} +STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH :Maximum bridge length: {STRING2} +STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH :Maximum tunnel length: {STRING2} +STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD :Manual primary industry construction method: {STRING2} STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :none STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :as other industries STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prospecting -STR_CONFIG_SETTING_INDUSTRY_PLATFORM :{LTBLUE}Flat area around industries: {ORANGE}{STRING1} tile{P 0:1 "" s} -STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Allow multiple similar industries per town: {ORANGE}{STRING1} -STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Show signals: {ORANGE}{STRING1} +STR_CONFIG_SETTING_INDUSTRY_PLATFORM :Flat area around industries: {STRING2} +STR_CONFIG_SETTING_MULTIPINDTOWN :Allow multiple similar industries per town: {STRING2} +STR_CONFIG_SETTING_SIGNALSIDE :Show signals: {STRING2} STR_CONFIG_SETTING_SIGNALSIDE_LEFT :On the left STR_CONFIG_SETTING_SIGNALSIDE_DRIVING_SIDE :On the driving side STR_CONFIG_SETTING_SIGNALSIDE_RIGHT :On the right -STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Show finances window at the end of the year: {ORANGE}{STRING1} -STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT :{LTBLUE}New orders are 'non-stop' by default: {ORANGE}{STRING1} -STR_CONFIG_SETTING_STOP_LOCATION :{LTBLUE}New train orders stop by default at the {ORANGE}{STRING1}{LTBLUE} of the platform +STR_CONFIG_SETTING_SHOWFINANCES :Show finances window at the end of the year: {STRING2} +STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT :New orders are 'non-stop' by default: {STRING2} +STR_CONFIG_SETTING_STOP_LOCATION :New train orders stop by default at the {STRING2} of the platform STR_CONFIG_SETTING_STOP_LOCATION_NEAR_END :near end STR_CONFIG_SETTING_STOP_LOCATION_MIDDLE :middle STR_CONFIG_SETTING_STOP_LOCATION_FAR_END :far end -STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING :{LTBLUE}Road vehicle queueing (with quantum effects): {ORANGE}{STRING1} -STR_CONFIG_SETTING_AUTOSCROLL :{LTBLUE}Pan window when mouse is at the edge: {ORANGE}{STRING1} -STR_CONFIG_SETTING_BRIBE :{LTBLUE}Allow bribing of the local authority: {ORANGE}{STRING1} -STR_CONFIG_SETTING_ALLOW_EXCLUSIVE :{LTBLUE}Allow buying exclusive transport rights: {ORANGE}{STRING1} -STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS :{LTBLUE}Allow funding buildings: {ORANGE}{STRING1} -STR_CONFIG_SETTING_ALLOW_FUND_ROAD :{LTBLUE}Allow funding local road reconstruction: {ORANGE}{STRING1} -STR_CONFIG_SETTING_ALLOW_GIVE_MONEY :{LTBLUE}Allow sending money to other companies: {ORANGE}{STRING1} -STR_CONFIG_SETTING_FREIGHT_TRAINS :{LTBLUE}Weight multiplier for freight to simulate heavy trains: {ORANGE}{STRING} -STR_CONFIG_SETTING_PLANE_SPEED :{LTBLUE}Plane speed factor: {ORANGE}1 / {STRING1} -STR_CONFIG_SETTING_PLANE_CRASHES :{LTBLUE}Number of plane crashes: {ORANGE}{STRING1} +STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING :Road vehicle queueing (with quantum effects): {STRING2} +STR_CONFIG_SETTING_AUTOSCROLL :Pan window when mouse is at the edge: {STRING2} +STR_CONFIG_SETTING_BRIBE :Allow bribing of the local authority: {STRING2} +STR_CONFIG_SETTING_ALLOW_EXCLUSIVE :Allow buying exclusive transport rights: {STRING2} +STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS :Allow funding buildings: {STRING2} +STR_CONFIG_SETTING_ALLOW_FUND_ROAD :Allow funding local road reconstruction: {STRING2} +STR_CONFIG_SETTING_ALLOW_GIVE_MONEY :Allow sending money to other companies: {STRING2} +STR_CONFIG_SETTING_FREIGHT_TRAINS :Weight multiplier for freight to simulate heavy trains: {STRING2} +STR_CONFIG_SETTING_PLANE_SPEED :Plane speed factor: {STRING2} +STR_CONFIG_SETTING_PLANE_SPEED_VALUE :1 / {COMMA} +STR_CONFIG_SETTING_PLANE_CRASHES :Number of plane crashes: {STRING2} STR_CONFIG_SETTING_PLANE_CRASHES_NONE :none STR_CONFIG_SETTING_PLANE_CRASHES_REDUCED :reduced STR_CONFIG_SETTING_PLANE_CRASHES_NORMAL :normal -STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD :{LTBLUE}Allow drive-through road stops on town owned roads: {ORANGE}{STRING} -STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD :{LTBLUE}Allow drive-through road stops on roads owned by competitors: {ORANGE}{STRING} -STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Allow building adjacent stations: {ORANGE}{STRING} -STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Enable multiple NewGRF engine sets: {ORANGE}{STRING} +STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD :Allow drive-through road stops on town owned roads: {STRING} +STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD :Allow drive-through road stops on roads owned by competitors: {STRING2} +STR_CONFIG_SETTING_ADJACENT_STATIONS :Allow building adjacent stations: {STRING2} +STR_CONFIG_SETTING_DYNAMIC_ENGINES :Enable multiple NewGRF engine sets: {STRING2} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Changing this setting is not possible when there are vehicles -STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE :{LTBLUE}Infrastructure maintenance: {ORANGE}{STRING1} +STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE :Infrastructure maintenance: {STRING2} -STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS :{LTBLUE}Airports never expire: {ORANGE}{STRING1} +STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS :Airports never expire: {STRING2} -STR_CONFIG_SETTING_WARN_LOST_VEHICLE :{LTBLUE}Warn if vehicle is lost: {ORANGE}{STRING1} -STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Review vehicles' orders: {ORANGE}{STRING1} +STR_CONFIG_SETTING_WARN_LOST_VEHICLE :Warn if vehicle is lost: {STRING2} +STR_CONFIG_SETTING_ORDER_REVIEW :Review vehicles' orders: {STRING2} STR_CONFIG_SETTING_ORDER_REVIEW_OFF :no STR_CONFIG_SETTING_ORDER_REVIEW_EXDEPOT :yes, but exclude stopped vehicles STR_CONFIG_SETTING_ORDER_REVIEW_ON :of all vehicles -STR_CONFIG_SETTING_WARN_INCOME_LESS :{LTBLUE}Warn if a vehicle's income is negative: {ORANGE}{STRING1} -STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES :{LTBLUE}Vehicles never expire: {ORANGE}{STRING1} -STR_CONFIG_SETTING_AUTORENEW_VEHICLE :{LTBLUE}Autorenew vehicle when it gets old: {ORANGE}{STRING1} -STR_CONFIG_SETTING_AUTORENEW_MONTHS :{LTBLUE}Autorenew when vehicle is {ORANGE}{STRING1}{LTBLUE} month{P 0:1 "" s} before/after max age -STR_CONFIG_SETTING_AUTORENEW_MONEY :{LTBLUE}Autorenew minimum needed money for renew: {ORANGE}{STRING1} -STR_CONFIG_SETTING_ERRMSG_DURATION :{LTBLUE}Duration of error message: {ORANGE}{STRING1} second{P 0:1 "" s} -STR_CONFIG_SETTING_HOVER_DELAY :{LTBLUE}Show tooltips: {ORANGE}Hover for {STRING1} second{P 0:1 "" s} -STR_CONFIG_SETTING_HOVER_DELAY_DISABLED :{LTBLUE}Show tooltips: {ORANGE}Right click -STR_CONFIG_SETTING_POPULATION_IN_LABEL :{LTBLUE}Show town population in the town name label: {ORANGE}{STRING1} -STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS :{LTBLUE}Thickness of lines in graphs: {ORANGE}{STRING1} - -STR_CONFIG_SETTING_LAND_GENERATOR :{LTBLUE}Land generator: {ORANGE}{STRING1} +STR_CONFIG_SETTING_WARN_INCOME_LESS :Warn if a vehicle's income is negative: {STRING2} +STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES :Vehicles never expire: {STRING2} +STR_CONFIG_SETTING_AUTORENEW_VEHICLE :Autorenew vehicle when it gets old: {STRING2} +STR_CONFIG_SETTING_AUTORENEW_MONTHS :Autorenew when vehicle is {STRING2} month{P 0:2 "" s} before/after max age +STR_CONFIG_SETTING_AUTORENEW_MONEY :Autorenew minimum needed money for renew: {STRING2} +STR_CONFIG_SETTING_ERRMSG_DURATION :Duration of error message: {STRING2} +STR_CONFIG_SETTING_ERRMSG_DURATION_VALUE :{COMMA} second{P 0 "" s} +STR_CONFIG_SETTING_HOVER_DELAY :Show tooltips: {STRING2} +STR_CONFIG_SETTING_HOVER_DELAY_VALUE :Hover for {COMMA} second{P 0 "" s} +STR_CONFIG_SETTING_HOVER_DELAY_DISABLED :Right click +STR_CONFIG_SETTING_POPULATION_IN_LABEL :Show town population in the town name label: {STRING2} +STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS :Thickness of lines in graphs: {STRING2} + +STR_CONFIG_SETTING_LAND_GENERATOR :Land generator: {STRING2} STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL :Original STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS :TerraGenesis -STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE :{LTBLUE}Max distance from edge for Oil Refineries: {ORANGE}{STRING1} tile{P 0:1 "" s} -STR_CONFIG_SETTING_SNOWLINE_HEIGHT :{LTBLUE}Snow line height: {ORANGE}{STRING1} -STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN :{LTBLUE}Roughness of terrain (TerraGenesis only) : {ORANGE}{STRING1} +STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE :Max distance from edge for Oil Refineries: {STRING2} +STR_CONFIG_SETTING_SNOWLINE_HEIGHT :Snow line height: {STRING2} +STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN :Roughness of terrain (TerraGenesis only) : {STRING2} STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH :Very Smooth STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_SMOOTH :Smooth STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_ROUGH :Rough STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_ROUGH :Very Rough -STR_CONFIG_SETTING_TREE_PLACER :{LTBLUE}Tree placer algorithm: {ORANGE}{STRING1} +STR_CONFIG_SETTING_TREE_PLACER :Tree placer algorithm: {STRING2} STR_CONFIG_SETTING_TREE_PLACER_NONE :None STR_CONFIG_SETTING_TREE_PLACER_ORIGINAL :Original STR_CONFIG_SETTING_TREE_PLACER_IMPROVED :Improved -STR_CONFIG_SETTING_HEIGHTMAP_ROTATION :{LTBLUE}Heightmap rotation: {ORANGE}{STRING1} +STR_CONFIG_SETTING_HEIGHTMAP_ROTATION :Heightmap rotation: {STRING2} STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE :Counter clockwise STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_CLOCKWISE :Clockwise -STR_CONFIG_SETTING_SE_FLAT_WORLD_HEIGHT :{LTBLUE}The height level a flat scenario map gets: {ORANGE}{STRING1} -STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES :{LTBLUE}Enable landscaping the tiles at the map borders: {ORANGE}{STRING1} +STR_CONFIG_SETTING_SE_FLAT_WORLD_HEIGHT :The height level a flat scenario map gets: {STRING2} +STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES :Enable landscaping the tiles at the map borders: {STRING2} STR_CONFIG_SETTING_EDGES_NOT_EMPTY :{WHITE}One or more tiles at the northern edge are not empty STR_CONFIG_SETTING_EDGES_NOT_WATER :{WHITE}One or more tiles at one of the edges is not water -STR_CONFIG_SETTING_STATION_SPREAD :{LTBLUE}Max station spread: {ORANGE}{STRING1} tile{P 0:1 "" s} {RED}Warning: High value slows game -STR_CONFIG_SETTING_SERVICEATHELIPAD :{LTBLUE}Service helicopters at helipads automatically: {ORANGE}{STRING1} -STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Link landscape toolbar to rail/road/water/airport toolbars: {ORANGE}{STRING1} -STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR :{LTBLUE}Land colour used at the smallmap: {ORANGE}{STRING1} +STR_CONFIG_SETTING_STATION_SPREAD :Max station spread: {STRING2} {RED}Warning: High value slows game +STR_CONFIG_SETTING_SERVICEATHELIPAD :Service helicopters at helipads automatically: {STRING2} +STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR :Link landscape toolbar to rail/road/water/airport toolbars: {STRING2} +STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR :Land colour used at the smallmap: {STRING2} STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN :Green STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN :Dark green STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET :Violet -STR_CONFIG_SETTING_REVERSE_SCROLLING :{LTBLUE}Reverse scroll direction: {ORANGE}{STRING1} -STR_CONFIG_SETTING_SMOOTH_SCROLLING :{LTBLUE}Smooth viewport scrolling: {ORANGE}{STRING1} -STR_CONFIG_SETTING_MEASURE_TOOLTIP :{LTBLUE}Show a measurement tooltip when using various build-tools: {ORANGE}{STRING1} -STR_CONFIG_SETTING_LIVERIES :{LTBLUE}Show company liveries: {ORANGE}{STRING1} +STR_CONFIG_SETTING_REVERSE_SCROLLING :Reverse scroll direction: {STRING2} +STR_CONFIG_SETTING_SMOOTH_SCROLLING :Smooth viewport scrolling: {STRING2} +STR_CONFIG_SETTING_MEASURE_TOOLTIP :Show a measurement tooltip when using various build-tools: {STRING2} +STR_CONFIG_SETTING_LIVERIES :Show company liveries: {STRING2} STR_CONFIG_SETTING_LIVERIES_NONE :None STR_CONFIG_SETTING_LIVERIES_OWN :Own company STR_CONFIG_SETTING_LIVERIES_ALL :All companies -STR_CONFIG_SETTING_PREFER_TEAMCHAT :{LTBLUE}Prefer team chat with : {ORANGE}{STRING1} -STR_CONFIG_SETTING_SCROLLWHEEL_SCROLLING :{LTBLUE}Function of scrollwheel: {ORANGE}{STRING1} +STR_CONFIG_SETTING_PREFER_TEAMCHAT :Prefer team chat with : {STRING2} +STR_CONFIG_SETTING_SCROLLWHEEL_SCROLLING :Function of scrollwheel: {STRING2} STR_CONFIG_SETTING_SCROLLWHEEL_ZOOM :Zoom map STR_CONFIG_SETTING_SCROLLWHEEL_SCROLL :Scroll map STR_CONFIG_SETTING_SCROLLWHEEL_OFF :Off -STR_CONFIG_SETTING_SCROLLWHEEL_MULTIPLIER :{LTBLUE}Map scrollwheel speed: {ORANGE}{STRING1} +STR_CONFIG_SETTING_SCROLLWHEEL_MULTIPLIER :Map scrollwheel speed: {STRING2} -STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU :{LTBLUE}Right-click emulation: {ORANGE}{STRING1} +STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU :Right-click emulation: {STRING2} STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND :Command+Click STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL :Ctrl+Click STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :Off -STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING :{LTBLUE}Left-click scrolling: {ORANGE}{STRING1} +STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING :Left-click scrolling: {STRING2} -STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES :{LTBLUE}Use the {ORANGE}{STRING1}{LTBLUE} date format for savegame names +STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES :Use the {STRING2} date format for savegame names STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG :long (31st Dec 2008) STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT :short (31-12-2008) STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO :ISO (2008-12-31) -STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE :{LTBLUE}Default palette to assume for NewGRFs not specifying a palette: {ORANGE}{STRING1} +STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE :Default palette to assume for NewGRFs not specifying a palette: {STRING2} STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE_DOS :DOS palette STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE_WIN :Windows palette -STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME :{LTBLUE}Automatically pause when starting a new game: {ORANGE}{STRING1} -STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL :{LTBLUE}When paused allow: {ORANGE}{STRING1} +STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME :Automatically pause when starting a new game: {STRING2} +STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL :When paused allow: {STRING2} STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS :no actions STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_CONSTRUCTION :all non-construction actions STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_LANDSCAPING :all but landscape modifying actions STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_ACTIONS :all actions -STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS :{LTBLUE}Use the advanced vehicle list: {ORANGE}{STRING1} -STR_CONFIG_SETTING_LOADING_INDICATORS :{LTBLUE}Use loading indicators: {ORANGE}{STRING1} -STR_CONFIG_SETTING_TIMETABLE_IN_TICKS :{LTBLUE}Show timetable in ticks rather than days: {ORANGE}{STRING1} -STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE :{LTBLUE}Show arrival and departure in timetables: {ORANGE}{STRING1} -STR_CONFIG_SETTING_QUICKGOTO :{LTBLUE}Quick creation of vehicle orders: {ORANGE}{STRING1} -STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE :{LTBLUE}Default rail type (after new game/game load): {ORANGE}{STRING1} +STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS :Use the advanced vehicle list: {STRING2} +STR_CONFIG_SETTING_LOADING_INDICATORS :Use loading indicators: {STRING2} +STR_CONFIG_SETTING_TIMETABLE_IN_TICKS :Show timetable in ticks rather than days: {STRING2} +STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE :Show arrival and departure in timetables: {STRING2} +STR_CONFIG_SETTING_QUICKGOTO :Quick creation of vehicle orders: {STRING2} +STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE :Default rail type (after new game/game load): {STRING2} STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_FIRST :First available STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_LAST :Last available STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_MOST_USED :Most used -STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION :{LTBLUE}Show reserved tracks: {ORANGE}{STRING1} -STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS :{LTBLUE}Keep building tools active after usage: {ORANGE}{STRING1} -STR_CONFIG_SETTING_EXPENSES_LAYOUT :{LTBLUE}Group expenses in company finance window: {ORANGE}{STRING1} - -STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING :{LTBLUE}Disable infrastructure building when no suitable vehicles are available: {ORANGE}{STRING1} -STR_CONFIG_SETTING_MAX_TRAINS :{LTBLUE}Max trains per company: {ORANGE}{STRING1} -STR_CONFIG_SETTING_MAX_ROAD_VEHICLES :{LTBLUE}Max road vehicles per company: {ORANGE}{STRING1} -STR_CONFIG_SETTING_MAX_AIRCRAFT :{LTBLUE}Max aircraft per company: {ORANGE}{STRING1} -STR_CONFIG_SETTING_MAX_SHIPS :{LTBLUE}Max ships per company: {ORANGE}{STRING1} - -STR_CONFIG_SETTING_AI_BUILDS_TRAINS :{LTBLUE}Disable trains for computer: {ORANGE}{STRING1} -STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES :{LTBLUE}Disable road vehicles for computer: {ORANGE}{STRING1} -STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT :{LTBLUE}Disable aircraft for computer: {ORANGE}{STRING1} -STR_CONFIG_SETTING_AI_BUILDS_SHIPS :{LTBLUE}Disable ships for computer: {ORANGE}{STRING1} - -STR_CONFIG_SETTING_AI_IN_MULTIPLAYER :{LTBLUE}Allow AIs in multiplayer: {ORANGE}{STRING1} -STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES :{LTBLUE}#opcodes before scripts are suspended: {ORANGE}{STRING1} - -STR_CONFIG_SETTING_SERVINT_ISPERCENT :{LTBLUE}Service intervals are in percents: {ORANGE}{STRING1} -STR_CONFIG_SETTING_SERVINT_TRAINS :{LTBLUE}Default service interval for trains: {ORANGE}{STRING1} day{P 0:1 "" s}/% -STR_CONFIG_SETTING_SERVINT_TRAINS_DISABLED :{LTBLUE}Default service interval for trains: {ORANGE}disabled -STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES :{LTBLUE}Default service interval for road vehicles: {ORANGE}{STRING1} day{P 0:1 "" s}/% -STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES_DISABLED :{LTBLUE}Default service interval for road vehicles: {ORANGE}disabled -STR_CONFIG_SETTING_SERVINT_AIRCRAFT :{LTBLUE}Default service interval for aircraft: {ORANGE}{STRING1} day{P 0:1 "" s}/% -STR_CONFIG_SETTING_SERVINT_AIRCRAFT_DISABLED :{LTBLUE}Default service interval for aircraft: {ORANGE}disabled -STR_CONFIG_SETTING_SERVINT_SHIPS :{LTBLUE}Default service interval for ships: {ORANGE}{STRING1} day{P 0:1 "" s}/% -STR_CONFIG_SETTING_SERVINT_SHIPS_DISABLED :{LTBLUE}Default service interval for ships: {ORANGE}disabled -STR_CONFIG_SETTING_NOSERVICE :{LTBLUE}Disable servicing when breakdowns set to none: {ORANGE}{STRING1} -STR_CONFIG_SETTING_WAGONSPEEDLIMITS :{LTBLUE}Enable wagon speed limits: {ORANGE}{STRING1} -STR_CONFIG_SETTING_DISABLE_ELRAILS :{LTBLUE}Disable electric rails: {ORANGE}{STRING1} - -STR_CONFIG_SETTING_COLOURED_NEWS_YEAR :{LTBLUE}Coloured news appears in: {ORANGE}{STRING1} -STR_CONFIG_SETTING_STARTING_YEAR :{LTBLUE}Starting year: {ORANGE}{STRING1} -STR_CONFIG_SETTING_SMOOTH_ECONOMY :{LTBLUE}Enable smooth economy (more, smaller changes): {ORANGE}{STRING1} -STR_CONFIG_SETTING_ALLOW_SHARES :{LTBLUE}Allow buying shares from other companies: {ORANGE}{STRING1} -STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE :{LTBLUE}Percentage of leg profit to pay in feeder systems: {ORANGE}{STRING1}% -STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY :{LTBLUE}When dragging, place signals every: {ORANGE}{STRING1} tile{P 0:1 "" s} -STR_CONFIG_SETTING_DRAG_SIGNALS_FIXED_DISTANCE :{LTBLUE}When dragging, keep fixed distance between signals: {ORANGE}{STRING1} -STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE :{LTBLUE}Automatically build semaphores before: {ORANGE}{STRING1} -STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI :{LTBLUE}Enable the signal GUI: {ORANGE}{STRING1} -STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE :{LTBLUE}Signal type to build by default: {ORANGE}{STRING1} +STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION :Show reserved tracks: {STRING2} +STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS :Keep building tools active after usage: {STRING2} +STR_CONFIG_SETTING_EXPENSES_LAYOUT :Group expenses in company finance window: {STRING2} + +STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING :Disable infrastructure building when no suitable vehicles are available: {STRING2} +STR_CONFIG_SETTING_MAX_TRAINS :Max trains per company: {STRING2} +STR_CONFIG_SETTING_MAX_ROAD_VEHICLES :Max road vehicles per company: {STRING2} +STR_CONFIG_SETTING_MAX_AIRCRAFT :Max aircraft per company: {STRING2} +STR_CONFIG_SETTING_MAX_SHIPS :Max ships per company: {STRING2} + +STR_CONFIG_SETTING_AI_BUILDS_TRAINS :Disable trains for computer: {STRING2} +STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES :Disable road vehicles for computer: {STRING2} +STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT :Disable aircraft for computer: {STRING2} +STR_CONFIG_SETTING_AI_BUILDS_SHIPS :Disable ships for computer: {STRING2} + +STR_CONFIG_SETTING_AI_IN_MULTIPLAYER :Allow AIs in multiplayer: {STRING2} +STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES :#opcodes before scripts are suspended: {STRING2} + +STR_CONFIG_SETTING_SERVINT_ISPERCENT :Service intervals are in percents: {STRING2} +STR_CONFIG_SETTING_SERVINT_TRAINS :Default service interval for trains: {STRING2} +STR_CONFIG_SETTING_SERVINT_VALUE :{COMMA} day{P 0 "" s}/% +STR_CONFIG_SETTING_SERVINT_DISABLED :disabled +STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES :Default service interval for road vehicles: {STRING2} +STR_CONFIG_SETTING_SERVINT_AIRCRAFT :Default service interval for aircraft: {STRING2} +STR_CONFIG_SETTING_SERVINT_SHIPS :Default service interval for ships: {STRING2} +STR_CONFIG_SETTING_NOSERVICE :Disable servicing when breakdowns set to none: {STRING2} +STR_CONFIG_SETTING_WAGONSPEEDLIMITS :Enable wagon speed limits: {STRING2} +STR_CONFIG_SETTING_DISABLE_ELRAILS :Disable electric rails: {STRING2} + +STR_CONFIG_SETTING_COLOURED_NEWS_YEAR :Coloured news appears in: {STRING2} +STR_CONFIG_SETTING_STARTING_YEAR :Starting year: {STRING2} +STR_CONFIG_SETTING_SMOOTH_ECONOMY :Enable smooth economy (more, smaller changes): {STRING2} +STR_CONFIG_SETTING_ALLOW_SHARES :Allow buying shares from other companies: {STRING2} +STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE :Percentage of leg profit to pay in feeder systems: {STRING2} +STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY :When dragging, place signals every: {STRING2} +STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_VALUE :{COMMA} tile{P 0 "" s} +STR_CONFIG_SETTING_DRAG_SIGNALS_FIXED_DISTANCE :When dragging, keep fixed distance between signals: {STRING2} +STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE :Automatically build semaphores before: {STRING2} +STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI :Enable the signal GUI: {STRING2} +STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE :Signal type to build by default: {STRING2} STR_CONFIG_SETTING_DEFAULT_SIGNAL_NORMAL :Block signals STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBS :Path signals STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBSOWAY :One-way path signals -STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES :{LTBLUE}Cycle through signal types: {ORANGE}{STRING1} +STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES :Cycle through signal types: {STRING2} STR_CONFIG_SETTING_CYCLE_SIGNAL_NORMAL :Block signals only STR_CONFIG_SETTING_CYCLE_SIGNAL_PBS :Path signals only STR_CONFIG_SETTING_CYCLE_SIGNAL_ALL :All -STR_CONFIG_SETTING_TOWN_LAYOUT :{LTBLUE}Road layout for new towns: {ORANGE}{STRING1} +STR_CONFIG_SETTING_TOWN_LAYOUT :Road layout for new towns: {STRING2} STR_CONFIG_SETTING_TOWN_LAYOUT_DEFAULT :original STR_CONFIG_SETTING_TOWN_LAYOUT_BETTER_ROADS :better roads STR_CONFIG_SETTING_TOWN_LAYOUT_2X2_GRID :2x2 grid STR_CONFIG_SETTING_TOWN_LAYOUT_3X3_GRID :3x3 grid STR_CONFIG_SETTING_TOWN_LAYOUT_RANDOM :random -STR_CONFIG_SETTING_ALLOW_TOWN_ROADS :{LTBLUE}Towns are allowed to build roads: {ORANGE}{STRING1} -STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS :{LTBLUE}Towns are allowed to build level crossings: {ORANGE}{STRING1} -STR_CONFIG_SETTING_NOISE_LEVEL :{LTBLUE}Allow town controlled noise level for airports: {ORANGE}{STRING} -STR_CONFIG_SETTING_TOWN_FOUNDING :{LTBLUE}Founding towns in game: {ORANGE}{STRING1} +STR_CONFIG_SETTING_ALLOW_TOWN_ROADS :Towns are allowed to build roads: {STRING2} +STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS :Towns are allowed to build level crossings: {STRING2} +STR_CONFIG_SETTING_NOISE_LEVEL :Allow town controlled noise level for airports: {STRING2} +STR_CONFIG_SETTING_TOWN_FOUNDING :Founding towns in game: {STRING2} STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN :forbidden STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED :allowed STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :allowed, custom town layout -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :{LTBLUE}In game placement of trees: {ORANGE}{STRING1} +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :In game placement of trees: {STRING2} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE :none {RED}(breaks lumber mill) STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST :only in rain forests STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL :everywhere -STR_CONFIG_SETTING_TOOLBAR_POS :{LTBLUE}Position of main toolbar: {ORANGE}{STRING1} -STR_CONFIG_SETTING_STATUSBAR_POS :{LTBLUE}Position of statusbar: {ORANGE}{STRING1} -STR_CONFIG_SETTING_SNAP_RADIUS :{LTBLUE}Window snap radius: {ORANGE}{STRING1} pixel{P 0:1 "" s} -STR_CONFIG_SETTING_SNAP_RADIUS_DISABLED :{LTBLUE}Window snap radius: {ORANGE}disabled -STR_CONFIG_SETTING_SOFT_LIMIT :{LTBLUE}Maximum number of non-sticky windows: {ORANGE}{STRING1} -STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED :{LTBLUE}Maximum number of non-sticky windows: {ORANGE}disabled -STR_CONFIG_SETTING_ZOOM_MIN :{LTBLUE}Maximum zoom in level: {ORANGE}{STRING1} -STR_CONFIG_SETTING_ZOOM_MAX :{LTBLUE}Maximum zoom out level: {ORANGE}{STRING1} +STR_CONFIG_SETTING_TOOLBAR_POS :Position of main toolbar: {STRING2} +STR_CONFIG_SETTING_STATUSBAR_POS :Position of statusbar: {STRING2} +STR_CONFIG_SETTING_SNAP_RADIUS :Window snap radius: {STRING2} +STR_CONFIG_SETTING_SNAP_RADIUS_VALUE :{COMMA} pixel{P 0 "" s} +STR_CONFIG_SETTING_SNAP_RADIUS_DISABLED :disabled +STR_CONFIG_SETTING_SOFT_LIMIT :Maximum number of non-sticky windows: {STRING2} +STR_CONFIG_SETTING_SOFT_LIMIT_VALUE :{COMMA} +STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED :disabled +STR_CONFIG_SETTING_ZOOM_MIN :Maximum zoom in level: {STRING2} +STR_CONFIG_SETTING_ZOOM_MAX :Maximum zoom out level: {STRING2} STR_CONFIG_SETTING_ZOOM_LVL_MIN :4x STR_CONFIG_SETTING_ZOOM_LVL_IN_2X :2x STR_CONFIG_SETTING_ZOOM_LVL_NORMAL :Normal STR_CONFIG_SETTING_ZOOM_LVL_OUT_2X :2x STR_CONFIG_SETTING_ZOOM_LVL_OUT_4X :4x STR_CONFIG_SETTING_ZOOM_LVL_OUT_8X :8x -STR_CONFIG_SETTING_TOWN_GROWTH :{LTBLUE}Town growth speed: {ORANGE}{STRING1} +STR_CONFIG_SETTING_TOWN_GROWTH :Town growth speed: {STRING2} STR_CONFIG_SETTING_TOWN_GROWTH_NONE :None STR_CONFIG_SETTING_TOWN_GROWTH_SLOW :Slow STR_CONFIG_SETTING_TOWN_GROWTH_NORMAL :Normal STR_CONFIG_SETTING_TOWN_GROWTH_FAST :Fast STR_CONFIG_SETTING_TOWN_GROWTH_VERY_FAST :Very fast -STR_CONFIG_SETTING_LARGER_TOWNS :{LTBLUE}Proportion of towns that will become cities: {ORANGE}1 in {STRING1} -STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED :{LTBLUE}Proportion of towns that will become cities: {ORANGE}None -STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER :{LTBLUE}Initial city size multiplier: {ORANGE}{STRING1} -STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD :{LTBLUE}Remove absurd road-elements during the road construction: {ORANGE}{STRING1} +STR_CONFIG_SETTING_LARGER_TOWNS :Proportion of towns that will become cities: {STRING2} +STR_CONFIG_SETTING_LARGER_TOWNS_VALUE :1 in {COMMA} +STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED :none +STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER :Initial city size multiplier: {STRING2} +STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD :Remove absurd road-elements during the road construction: {STRING2} STR_CONFIG_SETTING_GUI :{ORANGE}Interface STR_CONFIG_SETTING_CONSTRUCTION :{ORANGE}Construction @@ -1380,10 +1387,10 @@ STR_CONFIG_SETTING_PATHFINDER_OPF :Original STR_CONFIG_SETTING_PATHFINDER_NPF :NPF STR_CONFIG_SETTING_PATHFINDER_YAPF_RECOMMENDED :YAPF {BLUE}(Recommended) -STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :{LTBLUE}Pathfinder for trains: {ORANGE}{STRING1} -STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES :{LTBLUE}Pathfinder for road vehicles: {ORANGE}{STRING1} -STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS :{LTBLUE}Pathfinder for ships: {ORANGE}{STRING1} -STR_CONFIG_SETTING_REVERSE_AT_SIGNALS :{LTBLUE}Automatic reversing at signals: {ORANGE}{STRING1} +STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Pathfinder for trains: {STRING2} +STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES :Pathfinder for road vehicles: {STRING2} +STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS :Pathfinder for ships: {STRING2} +STR_CONFIG_SETTING_REVERSE_AT_SIGNALS :Automatic reversing at signals: {STRING2} STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Change setting value @@ -4478,6 +4485,7 @@ STR_ORANGE_STRING :{ORANGE}{STRING STR_RED_STRING :{RED}{STRING} STR_LTBLUE_STRING :{LTBLUE}{STRING} STR_WHITE_STRING :{WHITE}{STRING} +STR_ORANGE_STRING1_LTBLUE :{ORANGE}{STRING1}{LTBLUE} STR_TINY_BLACK_HEIGHT :{TINY_FONT}{BLACK}{HEIGHT} STR_TINY_BLACK_VEHICLE :{TINY_FONT}{BLACK}{VEHICLE} STR_TINY_RIGHT_ARROW :{TINY_FONT}{RIGHT_ARROW} diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 0fdc0fd49..5103bd572 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1274,12 +1274,13 @@ void SettingEntry::DrawSetting(GameSettings *settings_ptr, const SettingDesc *sd if ((sdb->flags & SGF_NETWORK_ONLY) && !_networking) editable = false; if ((sdb->flags & SGF_NO_NETWORK) && _networking) editable = false; + SetDParam(0, STR_ORANGE_STRING1_LTBLUE); if (sdb->cmd == SDT_BOOLX) { /* Draw checkbox for boolean-value either on/off */ bool on = ReadValue(var, sd->save.conv) != 0; DrawBoolButton(buttons_left, button_y, on, editable); - SetDParam(0, on ? STR_CONFIG_SETTING_ON : STR_CONFIG_SETTING_OFF); + SetDParam(1, on ? STR_CONFIG_SETTING_ON : STR_CONFIG_SETTING_OFF); } else { int32 value; @@ -1289,20 +1290,15 @@ void SettingEntry::DrawSetting(GameSettings *settings_ptr, const SettingDesc *sd DrawArrowButtons(buttons_left, button_y, COLOUR_YELLOW, state, editable && value != (sdb->flags & SGF_0ISDISABLED ? 0 : sdb->min), editable && (uint32)value != sdb->max); disabled = (value == 0) && (sdb->flags & SGF_0ISDISABLED); - if (disabled) { - SetDParam(0, STR_CONFIG_SETTING_DISABLED); + + if ((sdb->flags & SGF_MULTISTRING) != 0) { + SetDParam(1, sdb->val_str - sdb->min + value); } else { - if (sdb->flags & SGF_CURRENCY) { - SetDParam(0, STR_JUST_CURRENCY_LONG); - } else if (sdb->flags & SGF_MULTISTRING) { - SetDParam(0, sdb->val_str - sdb->min + value); - } else { - SetDParam(0, (sdb->flags & SGF_NOCOMMA) ? STR_JUST_INT : STR_JUST_COMMA); - } - SetDParam(1, value); + SetDParam(1, sdb->val_str + disabled); } + SetDParam(2, value); } - DrawString(text_left, text_right, y, (sdb->str) + disabled); + DrawString(text_left, text_right, y, sdb->str, TC_LIGHT_BLUE); } diff --git a/src/table/company_settings.ini b/src/table/company_settings.ini index f01a0b18e..e19004dd4 100644 --- a/src/table/company_settings.ini +++ b/src/table/company_settings.ini @@ -45,6 +45,7 @@ def = 6 min = -12 max = 12 str = STR_CONFIG_SETTING_AUTORENEW_MONTHS +strval = STR_JUST_COMMA [SDT_VAR] base = CompanySettings @@ -55,6 +56,7 @@ def = 100000 min = 0 max = 2000000 str = STR_CONFIG_SETTING_AUTORENEW_MONEY +strval = STR_JUST_CURRENCY_LONG [SDT_BOOL] base = CompanySettings @@ -77,6 +79,7 @@ def = 150 min = 5 max = 800 str = STR_CONFIG_SETTING_SERVINT_TRAINS +strval = STR_CONFIG_SETTING_SERVINT_VALUE proc = InvalidateDetailsWindow [SDT_VAR] @@ -88,6 +91,7 @@ def = 150 min = 5 max = 800 str = STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES +strval = STR_CONFIG_SETTING_SERVINT_VALUE proc = InvalidateDetailsWindow [SDT_VAR] @@ -99,6 +103,7 @@ def = 360 min = 5 max = 800 str = STR_CONFIG_SETTING_SERVINT_SHIPS +strval = STR_CONFIG_SETTING_SERVINT_VALUE proc = InvalidateDetailsWindow [SDT_VAR] @@ -110,6 +115,7 @@ def = 100 min = 5 max = 800 str = STR_CONFIG_SETTING_SERVINT_AIRCRAFT +strval = STR_CONFIG_SETTING_SERVINT_VALUE proc = InvalidateDetailsWindow [SDT_END] diff --git a/src/table/settings.ini b/src/table/settings.ini index 5e2c51495..d67528f2d 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -455,6 +455,7 @@ min = 1 max = 2048 interval = 1 str = STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH +strval = STR_CONFIG_SETTING_TILE_LENGTH [SDT_VAR] base = GameSettings @@ -467,6 +468,7 @@ min = 1 max = 2048 interval = 1 str = STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH +strval = STR_CONFIG_SETTING_TILE_LENGTH # construction.longbridges [SDT_NULL] @@ -575,6 +577,7 @@ min = 0 max = 10 interval = 1 str = STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS +strval = STR_CONFIG_SETTING_PERCENTAGE proc = TrainSlopeSteepnessChanged [SDT_VAR] @@ -587,6 +590,7 @@ min = 0 max = 10 interval = 1 str = STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS +strval = STR_CONFIG_SETTING_PERCENTAGE proc = RoadVehSlopeSteepnessChanged [SDT_BOOL] @@ -605,6 +609,7 @@ min = 1 max = 64 interval = 1 str = STR_CONFIG_SETTING_TRAIN_LENGTH +strval = STR_CONFIG_SETTING_TILE_LENGTH ; vehicle.mammoth_trains [SDT_NULL] @@ -718,6 +723,7 @@ def = 500 min = 0 max = 5000 str = STR_CONFIG_SETTING_MAX_TRAINS +strval = STR_JUST_COMMA proc = RedrawScreen [SDT_VAR] @@ -728,6 +734,7 @@ def = 500 min = 0 max = 5000 str = STR_CONFIG_SETTING_MAX_ROAD_VEHICLES +strval = STR_JUST_COMMA proc = RedrawScreen [SDT_VAR] @@ -738,6 +745,7 @@ def = 200 min = 0 max = 5000 str = STR_CONFIG_SETTING_MAX_AIRCRAFT +strval = STR_JUST_COMMA proc = RedrawScreen [SDT_VAR] @@ -748,6 +756,7 @@ def = 300 min = 0 max = 5000 str = STR_CONFIG_SETTING_MAX_SHIPS +strval = STR_JUST_COMMA proc = RedrawScreen [SDTG_BOOL] @@ -831,6 +840,7 @@ min = 1 max = 255 interval = 1 str = STR_CONFIG_SETTING_FREIGHT_TRAINS +strval = STR_JUST_COMMA proc = UpdateConsists ; order.timetabling @@ -849,6 +859,7 @@ def = 4 min = 1 max = 4 str = STR_CONFIG_SETTING_PLANE_SPEED +strval = STR_CONFIG_SETTING_PLANE_SPEED_VALUE [SDT_BOOL] base = GameSettings @@ -915,6 +926,7 @@ def = 12 min = 4 max = 64 str = STR_CONFIG_SETTING_STATION_SPREAD +strval = STR_CONFIG_SETTING_TILE_LENGTH proc = InvalidateStationBuildWindow [SDT_BOOL] @@ -1004,6 +1016,7 @@ def = 1 min = 0 max = 4 str = STR_CONFIG_SETTING_INDUSTRY_PLATFORM +strval = STR_CONFIG_SETTING_TILE_LENGTH [SDT_BOOL] base = GameSettings @@ -1061,6 +1074,7 @@ def = DEF_SNOWLINE_HEIGHT min = MIN_SNOWLINE_HEIGHT max = MAX_SNOWLINE_HEIGHT str = STR_CONFIG_SETTING_SNOWLINE_HEIGHT +strval = STR_JUST_COMMA [SDT_NULL] length = 4 @@ -1076,6 +1090,7 @@ min = MIN_YEAR max = MAX_YEAR interval = 1 str = STR_CONFIG_SETTING_STARTING_YEAR +strval = STR_JUST_INT [SDT_NULL] length = 4 @@ -1103,6 +1118,7 @@ def = 75 min = 0 max = 100 str = STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE +strval = STR_CONFIG_SETTING_PERCENTAGE [SDT_VAR] base = GameSettings @@ -1127,6 +1143,7 @@ min = 0 max = 255 interval = 1 str = STR_CONFIG_SETTING_LARGER_TOWNS +strval = STR_CONFIG_SETTING_LARGER_TOWNS_VALUE [SDT_VAR] base = GameSettings @@ -1138,6 +1155,7 @@ min = 1 max = 10 interval = 1 str = STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER +strval = STR_JUST_COMMA [SDT_BOOL] base = GameSettings @@ -1192,6 +1210,7 @@ min = 5000 max = 250000 interval = 2500 str = STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES +strval = STR_JUST_COMMA ## [SDT_VAR] @@ -1766,6 +1785,7 @@ def = 32 min = 12 max = 48 str = STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE +strval = STR_CONFIG_SETTING_TILE_LENGTH [SDT_VAR] base = GameSettings @@ -1830,6 +1850,7 @@ def = 1 min = 0 max = 15 str = STR_CONFIG_SETTING_SE_FLAT_WORLD_HEIGHT +strval = STR_JUST_COMMA ## [SDT_VAR] @@ -2047,6 +2068,7 @@ def = 5 min = 0 max = 20 str = STR_CONFIG_SETTING_ERRMSG_DURATION +strval = STR_CONFIG_SETTING_ERRMSG_DURATION_VALUE [SDTC_VAR] var = gui.hover_delay @@ -2057,6 +2079,7 @@ def = 2 min = 1 max = 5 str = STR_CONFIG_SETTING_HOVER_DELAY +strval = STR_CONFIG_SETTING_HOVER_DELAY_VALUE [SDTC_VAR] var = gui.toolbar_pos @@ -2091,6 +2114,7 @@ def = 10 min = 1 max = 32 str = STR_CONFIG_SETTING_SNAP_RADIUS +strval = STR_CONFIG_SETTING_SNAP_RADIUS_VALUE [SDTC_VAR] var = gui.window_soft_limit @@ -2102,6 +2126,7 @@ min = 5 max = 255 interval = 1 str = STR_CONFIG_SETTING_SOFT_LIMIT +strval = STR_CONFIG_SETTING_SOFT_LIMIT_VALUE [SDTC_VAR] var = gui.zoom_min @@ -2190,6 +2215,7 @@ min = 1 max = 15 interval = 1 str = STR_CONFIG_SETTING_SCROLLWHEEL_MULTIPLIER +strval = STR_JUST_COMMA [SDTC_BOOL] var = gui.pause_on_newgame @@ -2268,6 +2294,7 @@ min = MIN_YEAR max = MAX_YEAR interval = 1 str = STR_CONFIG_SETTING_COLOURED_NEWS_YEAR +strval = STR_JUST_INT [SDTC_VAR] var = gui.drag_signals_density @@ -2277,6 +2304,7 @@ def = 4 min = 1 max = 20 str = STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY +strval = STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_VALUE proc = DragSignalsDensityChanged [SDTC_BOOL] @@ -2295,6 +2323,7 @@ min = MIN_YEAR max = MAX_YEAR interval = 1 str = STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE +strval = STR_JUST_INT proc = ResetSignalVariant [SDTC_BOOL] @@ -2462,6 +2491,7 @@ def = 3 min = 1 max = 5 str = STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS +strval = STR_JUST_COMMA proc = RedrawScreen ; For the dedicated build we'll enable dates in logs by default. -- cgit v1.2.3-70-g09d2