Merge branch 'master' into jgrpp

# Conflicts:
#	src/game/game_gui.cpp
#	src/graph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/newgrf.cpp
#	src/order_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/saveload/saveload.h
#	src/script/api/script_text.cpp
#	src/script/script_gui.cpp
#	src/settings_table.cpp
#	src/strings.cpp
#	src/table/settings/economy_settings.ini
#	src/table/settings/locale_settings.ini
#	src/timetable_gui.cpp

src/unit_conversion.h

@@ -10,9 +10,9 @@
 #ifndef UNIT_CONVERSION_H
 #define UNIT_CONVERSION_H
 
-uint ConvertSpeedToDisplaySpeed(uint speed);
-uint ConvertSpeedToUnitDisplaySpeed(uint speed);
-uint ConvertDisplaySpeedToSpeed(uint speed);
+uint ConvertSpeedToDisplaySpeed(uint speed, VehicleType type);
+uint ConvertSpeedToUnitDisplaySpeed(uint speed, VehicleType type);
+uint ConvertDisplaySpeedToSpeed(uint speed, VehicleType type);
 uint ConvertWeightToDisplayWeight(uint weight);
 uint ConvertDisplayWeightToWeight(uint weight);
 uint ConvertPowerToDisplayPower(uint power);