Merge branch 'tracerestrict-sx' into jgrpp

# Conflicts:
#	src/lang/english.txt
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/settings.ini
#	src/vehicle_gui.cpp
This commit is contained in:
Jonathan G Rennison
2016-07-05 22:34:50 +01:00
14 changed files with 346 additions and 28 deletions

View File

@@ -3910,6 +3910,15 @@ strhelp = STR_CONFIG_SETTING_SHOW_TRAIN_LENGTH_IN_DETAILS_HELPTEXT
proc = RedrawScreen
cat = SC_BASIC
[SDTC_BOOL]
var = gui.show_train_weight_ratios_in_details
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false
str = STR_CONFIG_SETTING_SHOW_TRAIN_WEIGHT_RATIOS_IN_DETAILS
strhelp = STR_CONFIG_SETTING_SHOW_TRAIN_WEIGHT_RATIOS_IN_DETAILS_HELPTEXT
proc = RedrawScreen
cat = SC_EXPERT
[SDTC_BOOL]
var = gui.show_vehicle_group_in_details
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC