Merge branch 'master' into jgrpp
# Conflicts: # src/openttd.cpp # src/settings_gui.cpp # src/settings_type.h # src/table/settings/gameopt_settings.ini # src/table/settings/gui_settings.ini
This commit is contained in:
@@ -74,6 +74,9 @@ STR_ABOUT_MENU_SHOW_PICKER_TOOL :Picker tool
|
||||
##after STR_ABOUT_MENU_SHOW_FRAMERATE
|
||||
STR_ABOUT_MENU_SHOW_TOGGLE_MODIFIER_KEYS :Modifier key window
|
||||
|
||||
##before STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF
|
||||
STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_MINUTES_CUSTOM :Every {COMMA}{NBSP}minute{P 0 "" s}
|
||||
|
||||
##after STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF
|
||||
STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_1_MONTH :Every month
|
||||
STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_3_MONTHS :Every 3 months
|
||||
@@ -140,7 +143,6 @@ STR_NEWS_TRAIN_OVERSHOT_STATION :{WHITE}{VEHICLE
|
||||
|
||||
STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_DAYS_CUSTOM :Every {COMMA}{NBSP}days
|
||||
STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_DAYS_CUSTOM_SINGULAR :Every day
|
||||
STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_MINUTES_CUSTOM :Every {COMMA} real-time minutes
|
||||
|
||||
STR_GAME_OPTIONS_AUTOSAVE_DAYS_QUERY_CAPT :{WHITE}Autosave interval in days
|
||||
STR_GAME_OPTIONS_AUTOSAVE_MINUTES_QUERY_CAPT :{WHITE}Autosave interval in real-time minutes
|
||||
|
||||
Reference in New Issue
Block a user