Reduce unnecessary diffs with upstream in lang/english.txt
This commit is contained in:
@@ -1519,7 +1519,7 @@ STR_CONFIG_SETTING_HOVER_DELAY_HELPTEXT :Delay before to
|
||||
STR_CONFIG_SETTING_HOVER_DELAY_VALUE :Hover for {COMMA} millisecond{P 0 "" s}
|
||||
###setting-zero-is-special
|
||||
STR_CONFIG_SETTING_HOVER_DELAY_DISABLED :Right click
|
||||
STR_CONFIG_SETTING_POPULATION_IN_LABEL :Show extra information in the town name label: {STRING2}
|
||||
STR_CONFIG_SETTING_POPULATION_IN_LABEL :Show town population in the town name label: {STRING2}
|
||||
STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT :Display the population of towns in their label on the map
|
||||
|
||||
STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS :Thickness of lines in graphs: {STRING2}
|
||||
@@ -2184,8 +2184,7 @@ STR_CONFIG_SETTING_ZOOM_MIN :Maximum zoom in
|
||||
STR_CONFIG_SETTING_ZOOM_MIN_HELPTEXT :The maximum zoom-in level for viewports. Note that enabling higher zoom-in levels increases memory requirements
|
||||
STR_CONFIG_SETTING_ZOOM_MAX :Maximum zoom out level: {STRING2}
|
||||
STR_CONFIG_SETTING_ZOOM_MAX_HELPTEXT :The maximum zoom-out level for viewports. Higher zoom-out levels might cause lag when used
|
||||
STR_CONFIG_SETTING_SPRITE_ZOOM_MIN :Highest resolution sprites to use: {STRING2}
|
||||
STR_CONFIG_SETTING_SPRITE_ZOOM_MIN_HELPTEXT :Limit the maximum resolution to use for sprites. Limiting sprite resolution will avoid using high resolution graphics even when available. This can help keep the game appearance unified when using a mix of GRF files with and without high resolution graphics.
|
||||
###length 10
|
||||
STR_CONFIG_SETTING_ZOOM_LVL_MIN :4x
|
||||
STR_CONFIG_SETTING_ZOOM_LVL_IN_2X :2x
|
||||
STR_CONFIG_SETTING_ZOOM_LVL_NORMAL :Normal
|
||||
@@ -2196,9 +2195,14 @@ STR_CONFIG_SETTING_ZOOM_LVL_OUT_16X :16x
|
||||
STR_CONFIG_SETTING_ZOOM_LVL_OUT_32X :32x
|
||||
STR_CONFIG_SETTING_ZOOM_LVL_OUT_64X :64x
|
||||
STR_CONFIG_SETTING_ZOOM_LVL_OUT_128X :128x
|
||||
|
||||
STR_CONFIG_SETTING_SPRITE_ZOOM_MIN :Highest resolution sprites to use: {STRING2}
|
||||
STR_CONFIG_SETTING_SPRITE_ZOOM_MIN_HELPTEXT :Limit the maximum resolution to use for sprites. Limiting sprite resolution will avoid using high resolution graphics even when available. This can help keep the game appearance unified when using a mix of GRF files with and without high resolution graphics.
|
||||
###length 3
|
||||
STR_CONFIG_SETTING_SPRITE_ZOOM_LVL_MIN :4x
|
||||
STR_CONFIG_SETTING_SPRITE_ZOOM_LVL_IN_2X :2x
|
||||
STR_CONFIG_SETTING_SPRITE_ZOOM_LVL_NORMAL :1x
|
||||
|
||||
STR_CONFIG_SETTING_TOWN_ZONES :{ORANGE}Custom town zones
|
||||
STR_CONFIG_SETTING_TOWN_ZONE_CALC_MODE :Use custom town zone calculations: {STRING2}
|
||||
STR_CONFIG_SETTING_TOWN_ZONE_CALC_MODE_HELPTEXT :Allows manually configuring the size of town zones generated by towns. The default values for custom town zone settings are similar to the default town generation. Some zones only require small changes while Zone 0 in particular benefits from larger values.
|
||||
@@ -2252,11 +2256,6 @@ STR_CONFIG_SETTING_LINKGRAPH_TIME :Take {STRING2}{
|
||||
STR_CONFIG_SETTING_LINKGRAPH_TIME_HELPTEXT :Time taken for each recalculation of a link graph component. When a recalculation is started, a thread is spawned which is allowed to run for this number of days. The shorter you set this the more likely it is that the thread is not finished when it's supposed to. Then the game stops until it is ("lag"). The longer you set it the longer it takes for the distribution to be updated when routes change.
|
||||
STR_CONFIG_SETTING_LINKGRAPH_NOT_DAYLENGTH_SCALED :Do not scale the linkgraph days by the day length factor: {STRING2}
|
||||
STR_CONFIG_SETTING_LINKGRAPH_NOT_DAYLENGTH_SCALED_HELPTEXT :When enabled, the linkgraph recalculation interval and time are in units of unscaled, original days, instead of day-length scaled calendar days.
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_MANUAL :manual
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC :asymmetric
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC_EQ :asymmetric (equal distribution)
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC_NEAREST :asymmetric (nearest)
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC :symmetric
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_PAX :Distribution mode for passengers: {STRING2}
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_PAX_HELPTEXT :"symmetric" means that roughly the same number of passengers will go from a station A to a station B as from B to A. "asymmetric" means that arbitrary numbers of passengers can go in either direction. "manual" means that no automatic distribution will take place for passengers.
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_MAIL :Distribution mode for mail: {STRING2}
|
||||
@@ -2265,6 +2264,13 @@ STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED :Distribution mo
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED_HELPTEXT :The ARMOURED cargo class contains valuables in the temperate, diamonds in the subtropical or gold in subarctic climate. NewGRFs may change that. "symmetric" means that roughly the same amount of that cargo will be sent from a station A to a station B as from B to A. "asymmetric" means that arbitrary amounts of that cargo can be sent in either direction. "manual" means that no automatic distribution will take place for that cargo. It is recommended to set this to asymmetric or manual when playing subarctic, as banks won't send any gold back to gold mines. For temperate and subtropical you can also choose symmetric as banks will send valuables back to the origin bank of some load of valuables.
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT :Distribution mode for other cargo classes: {STRING2}
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT_HELPTEXT :"asymmetric" means that arbitrary amounts of cargo can be sent in either direction. "manual" means that no automatic distribution will take place for those cargoes.
|
||||
###length 5
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_MANUAL :manual
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC :asymmetric
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC_EQ :asymmetric (equal distribution)
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC_NEAREST :asymmetric (nearest)
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC :symmetric
|
||||
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_PER_CARGO :Distribution mode override for this cargo: {STRING2}
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_PER_CARGO_PARAM :Distribution mode override for {STRING}: {STRING2}
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_PER_CARGO_HELPTEXT :"(default)" means that the distribution mode is the default for the class of this cargo. "symmetric" means that roughly the same number of cargo will go from a station A to a station B as from B to A. "asymmetric" means that arbitrary amounts of cargo can be sent in either direction. "manual" means that no automatic distribution will take place for this cargo.
|
||||
@@ -4631,7 +4637,7 @@ STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Rebuild
|
||||
STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Details
|
||||
STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}View detailed infrastructure counts
|
||||
STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Give money
|
||||
STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Transfer money to a different company
|
||||
STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Give money to this company
|
||||
|
||||
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}New Face
|
||||
STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Select new face for manager
|
||||
@@ -4719,8 +4725,6 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP :{BLACK}Road veh
|
||||
STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Ships - click on ship for information
|
||||
STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Aircraft - click on aircraft for information
|
||||
|
||||
STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Profit this year: {CURRENCY_LONG} (last year: {CURRENCY_LONG})
|
||||
STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR_LIFETIME :{STRING2} (lifetime: {CURRENCY_LONG})
|
||||
STR_VEHICLE_LIST_AGE :{STRING2}, Age: {COMMA} year{P "" s} ({COMMA})
|
||||
STR_VEHICLE_LIST_AGE_RED :{STRING2}, Age: {RED}{COMMA} {BLACK}year{P "" s} ({COMMA})
|
||||
STR_VEHICLE_LIST_CARGO :{STRING2}, Cargoes: {CARGO_LIST}
|
||||
@@ -4748,6 +4752,8 @@ STR_VEHICLE_LIST_MANAGE_LIST :{BLACK}Manage l
|
||||
STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP :{BLACK}Send instructions to all vehicles in this list
|
||||
STR_VEHICLE_LIST_REPLACE_VEHICLES :Replace vehicles
|
||||
STR_VEHICLE_LIST_SEND_FOR_SERVICING :Send for Servicing
|
||||
STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Profit this year: {CURRENCY_LONG} (last year: {CURRENCY_LONG})
|
||||
STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR_LIFETIME :{STRING2} (lifetime: {CURRENCY_LONG})
|
||||
STR_VEHICLE_LIST_CANCEL_DEPOT_SERVICE :Cancel Servicing/Send to
|
||||
|
||||
STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT :Send to Depot
|
||||
|
Reference in New Issue
Block a user