Merge branch 'new-ride-window'

Conflicts:
	src/language.c

src/string_ids.h

@@ -237,7 +237,14 @@ enum {
 	STR_SHOPS_AND_STALLS = 975,
 	STR_RESTROOMS_AND_INFORMATION_KIOSKS = 976,
 
+	STR_NEW_TRANSPORT_RIDES = 977,
+	STR_NEW_GENTLE_RIDES = 978,
+	STR_NEW_ROLLER_COASTERS = 979,
+	STR_NEW_THRILL_RIDES = 980,
+	STR_NEW_WATER_RIDES = 981,
+	STR_NEW_SHOPS_STALLS = 982,
 	STR_RESEARCH_AND_DEVELOPMENT = 983,
+
 	STR_RAISE_COST_AMOUNT = 984,
 	STR_LOWER_COST_AMOUNT = 985,
 	STR_COST_AMOUNT = 986,
@@ -297,6 +304,13 @@ enum {
 	STR_NUMERIC_UP = 1218,
 	STR_NUMERIC_DOWN = 1219,
 
+	STR_TRANSPORT_RIDES_TIP = 1223,
+	STR_GENTLE_RIDES_TIP = 1224,
+	STR_ROLLER_COASTERS_TIP = 1225,
+	STR_THRILL_RIDES_TIP = 1226,
+	STR_WATER_RIDES_TIP = 1227,
+	STR_SHOPS_STALLS_TIP = 1228,
+
 	STR_ROTATE_OBJECTS_90 = 1327,
 
 	STR_BUILD_THIS = 1407,
@@ -514,7 +528,8 @@ enum {
 	STR_RESEARCH_FUNDING_ = 2264,
 	STR_RESEARCH_COST_PER_MONTH = 2265,
 	STR_RESEARCH_PRIORITIES = 2266,
-
+	STR_CURRENTLY_IN_DEVELOPMENT = 2267,
+	STR_LAST_DEVELOPMENT = 2268,
 	STR_RESEARCH_TYPE_LABEL = 2269,
 	STR_RESEARCH_PROGRESS_LABEL = 2270,
 	STR_RESEARCH_EXPECTED_LABEL = 2271,