Merge tag '13.0-beta2' into jgrpp

# Conflicts:
#	src/cheat_gui.cpp
#	src/company_gui.cpp
#	src/console_gui.cpp
#	src/depot_gui.cpp
#	src/error_gui.cpp
#	src/gfx.cpp
#	src/graph_gui.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/korean.txt
#	src/lang/polish.txt
#	src/misc_gui.cpp
#	src/network/network_content_gui.h
#	src/newgrf_debug_gui.cpp
#	src/order_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/station_gui.cpp
#	src/subsidy_gui.cpp
#	src/table/settings/gui_settings.ini
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle_gui.cpp
#	src/viewport.cpp
#	src/water_cmd.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h

src/table/settings/misc_settings.ini

@@ -361,21 +361,12 @@ max      = UINT32_MAX
 cat      = SC_EXPERT
 
 [SDTG_VAR]
-name     = ""gui_zoom""
-type     = SLE_INT8
-var      = _gui_zoom_cfg
-def      = ZOOM_LVL_CFG_AUTO
-min      = ZOOM_LVL_CFG_AUTO
-max      = ZOOM_LVL_OUT_4X
-cat      = SC_BASIC
-
-[SDTG_VAR]
-name     = ""font_zoom""
-type     = SLE_INT8
-var      = _font_zoom_cfg
-def      = ZOOM_LVL_CFG_AUTO
-min      = ZOOM_LVL_CFG_AUTO
-max      = ZOOM_LVL_OUT_4X
+name     = ""gui_scale""
+type     = SLE_INT32
+var      = _gui_scale_cfg
+def      = -1
+min      = -1
+max      = MAX_INTERFACE_SCALE
 cat      = SC_BASIC
 
 [SDTG_BOOL]

src/table/settings/settings.ini

@@ -5539,6 +5539,23 @@ strhelp  = STR_CONFIG_SETTING_SHOW_NEWGRF_NAME_HELPTEXT
 post_cb  = [](auto) { MarkWholeScreenDirty(); }
 cat      = SC_ADVANCED
 
+[SDTC_BOOL]
+var      = gui.show_cargo_in_vehicle_lists
+flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
+def      = false
+str      = STR_CONFIG_SETTING_SHOW_CARGO_IN_LISTS
+strhelp  = STR_CONFIG_SETTING_SHOW_CARGO_IN_LISTS_HELPTEXT
+post_cb  = [](auto) { MarkWholeScreenDirty(); }
+cat      = SC_ADVANCED
+
+[SDTC_BOOL]
+var      = gui.scale_bevels
+flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
+def      = true
+post_cb  = [](auto) { SetupWidgetDimensions(); ReInitAllWindows(true); }
+cat      = SC_BASIC
+startup  = true
+
 [SDTC_BOOL]
 var      = gui.show_wagon_intro_year
 flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC