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/video/video_driver.hpp

@@ -172,15 +172,13 @@ public:
 	}
 
 	/**
-	 * Get a suggested default GUI zoom taking screen DPI into account.
+	 * Get a suggested default GUI scale taking screen DPI into account.
 	 */
-	virtual ZoomLevel GetSuggestedUIZoom()
+	virtual int GetSuggestedUIScale()
 	{
 		float dpi_scale = this->GetDPIScale();
 
-		if (dpi_scale >= 3.0f) return ZOOM_LVL_NORMAL;
-		if (dpi_scale >= 1.5f) return ZOOM_LVL_OUT_2X;
-		return ZOOM_LVL_OUT_4X;
+		return Clamp(dpi_scale * 100, MIN_INTERFACE_SCALE, MAX_INTERFACE_SCALE);
 	}
 
 	virtual const char *GetInfoString() const