Merge branch 'master' into jgrpp

# Conflicts:
#	config.lib
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/aircraft_cmd.cpp
#	src/base_station_base.h
#	src/core/pool_type.hpp
#	src/disaster_vehicle.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/group.h
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/network_command.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehiclelist.cpp
#	src/window_type.h

src/hotkeys.cpp

@@ -38,10 +38,15 @@ static const KeycodeNames _keycode_to_name[] = {
 	{"META", WKC_META},
 	{"GLOBAL", WKC_GLOBAL_HOTKEY},
 	{"ESC", WKC_ESC},
-	{"DEL", WKC_DELETE},
 	{"BACKSPACE", WKC_BACKSPACE},
+	{"INS", WKC_INSERT},
+	{"DEL", WKC_DELETE},
+	{"PAGEUP", WKC_PAGEUP},
+	{"PAGEDOWN", WKC_PAGEDOWN},
+	{"END", WKC_END},
+	{"HOME", WKC_HOME},
 	{"RETURN", WKC_RETURN},
-	{"BACKQUOTE", WKC_BACKQUOTE},
+	{"SPACE", WKC_SPACE},
 	{"F1", WKC_F1},
 	{"F2", WKC_F2},
 	{"F3", WKC_F3},
@@ -54,11 +59,24 @@ static const KeycodeNames _keycode_to_name[] = {
 	{"F10", WKC_F10},
 	{"F11", WKC_F11},
 	{"F12", WKC_F12},
+	{"BACKQUOTE", WKC_BACKQUOTE},
 	{"PAUSE", WKC_PAUSE},
-	{"COMMA", WKC_COMMA},
-	{"NUM_PLUS", WKC_NUM_PLUS},
+	{"NUM_DIV", WKC_NUM_DIV},
+	{"NUM_MUL", WKC_NUM_MUL},
 	{"NUM_MINUS", WKC_NUM_MINUS},
+	{"NUM_PLUS", WKC_NUM_PLUS},
+	{"NUM_ENTER", WKC_NUM_ENTER},
+	{"NUM_DOT", WKC_NUM_DECIMAL},
+	{"/", WKC_SLASH},
+	{";", WKC_SEMICOLON},
 	{"=", WKC_EQUALS},
+	{"[", WKC_L_BRACKET},
+	{"\\", WKC_BACKSLASH},
+	{"]", WKC_R_BRACKET},
+	{"'", WKC_SINGLEQUOTE},
+	{",", WKC_COMMA},
+	{"COMMA", WKC_COMMA}, // legacy variant, should be below ","
+	{".", WKC_PERIOD},
 	{"-", WKC_MINUS},
 	{"PAGE_UP", WKC_PAGEUP},
 	{"PAGE_DOWN", WKC_PAGEDOWN},