Merge branch 'pr-270' into jgrpp

# Conflicts:
#	src/lang/english.txt
#	src/settings_type.h
#	src/table/settings.ini
This commit is contained in:
Jonathan G Rennison
2021-06-15 19:32:54 +01:00
5 changed files with 74 additions and 2 deletions

View File

@@ -5479,6 +5479,18 @@ max = 2
str = STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE
strhelp = STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_HELPTEXT
strval = STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_OFF
[SDTC_VAR]
var = gui.demolish_confirm_mode
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
guiflags = SGF_MULTISTRING
def = 2
min = 0
max = 2
str = STR_CONFIG_SETTING_DEMOLISH_CONFIRM_MODE
strhelp = STR_CONFIG_SETTING_DEMOLISH_CONFIRM_MODE_HELPTEXT
strval = STR_CONFIG_SETTING_DEMOLISH_CONFIRM_MODE_OFF
cat = SC_BASIC
; For the dedicated build we'll enable dates in logs by default.