Mercurial > hg > openttd
changeset 17461:7287501a7c54 draft
(svn r22215) -Codechange: Unduplicate original/realistic strings.
author | alberth <alberth@openttd.org> |
---|---|
date | Sun, 06 Mar 2011 15:58:03 +0000 |
parents | a1a6e5d8221c |
children | f8061e9d4122 |
files | src/lang/english.txt src/table/settings.ini |
diffstat | 2 files changed, 7 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1094,21 +1094,18 @@ STR_CONFIG_SETTING_COMPANIES_OWN :Own company STR_CONFIG_SETTING_COMPANIES_ALL :All companies +STR_CONFIG_SETTING_NONE :None +STR_CONFIG_SETTING_ORIGINAL :Original +STR_CONFIG_SETTING_REALISTIC :Realistic + 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_SMOKE_AMOUNT_NONE :None -STR_CONFIG_SETTING_SMOKE_AMOUNT_ORIGINAL :Original -STR_CONFIG_SETTING_SMOKE_AMOUNT_REALISTIC :Realistic STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL :{LTBLUE}Train acceleration model: {ORANGE}{STRING1} -STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_ORIGINAL :Original -STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC :Realistic STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL :{LTBLUE}Road vehicle acceleration model: {ORANGE}{STRING1} -STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL :Original -STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC :Realistic 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}
--- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -526,7 +526,7 @@ max = 1 interval = 1 str = STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL -strval = STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_ORIGINAL +strval = STR_CONFIG_SETTING_ORIGINAL proc = TrainAccelerationModelChanged [SDT_VAR] @@ -540,7 +540,7 @@ max = 1 interval = 1 str = STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL -strval = STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL +strval = STR_CONFIG_SETTING_ORIGINAL proc = RoadVehAccelerationModelChanged [SDT_VAR] @@ -599,7 +599,7 @@ min = 0 max = 2 str = STR_CONFIG_SETTING_SMOKE_AMOUNT -strval = STR_CONFIG_SETTING_SMOKE_AMOUNT_NONE +strval = STR_CONFIG_SETTING_NONE ; order.gotodepot [SDT_NULL]