diff options
| author | alberth <alberth@openttd.org> | 2011-03-06 15:58:03 +0000 |
|---|---|---|
| committer | alberth <alberth@openttd.org> | 2011-03-06 15:58:03 +0000 |
| commit | 7ee064b75da8dd9e770e82c795352c24c4547300 (patch) | |
| tree | 9466b01d799fe60f8e354e248b234f1024e1ac2a | |
| parent | b7814a00cd062a400b43ef32a1bf1d7cc9419b44 (diff) | |
| download | openttd-7ee064b75da8dd9e770e82c795352c24c4547300.tar.xz | |
(svn r22215) -Codechange: Unduplicate original/realistic strings.
| -rw-r--r-- | src/lang/english.txt | 11 | ||||
| -rw-r--r-- | src/table/settings.ini | 6 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/lang/english.txt b/src/lang/english.txt index 532aa00c6..26a67b6fe 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1094,21 +1094,18 @@ STR_CONFIG_SETTING_COMPANIES_OFF :Off 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} diff --git a/src/table/settings.ini b/src/table/settings.ini index 7893520be..bc77aff22 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -526,7 +526,7 @@ min = 0 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 @@ min = 0 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 @@ def = 1 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] |