Merge remote-tracking branch 'upstream/master' into hire-staff-command

src/string_ids.h

@@ -280,6 +280,7 @@ enum {
 	STR_CONSTRUCT_THE_SELECTED_FOOTPATH_SECTION_TIP = 1189,
 	STR_REMOVE_PREVIOUS_FOOTPATH_SECTION_TIP = 1190,
 	STR_COST = 1191,
+	STR_LOSS = 1192,
 
 	STR_CLOSED = 1194,
 	STR_TEST_RUN = 1195,
@@ -415,6 +416,32 @@ enum {
 	STR_INSPECTING_RIDE = 1886,
 	
 	STR_BUILD_RIDE_TIP = 1895,
+	STR_FINANCES_SUMMARY_EXPENDITURE_INCOME = 1896,
+	STR_FINANCES_SUMMARY_RIDE_CONSTRUCTION = 1897,
+	STR_FINANCES_SUMMARY_RIDE_RUNNING_COSTS = 1898,
+	STR_FINANCES_SUMMARY_LAND_PURCHASE = 1899,
+	STR_FINANCES_SUMMARY_LANDSCAPING = 1900,
+	STR_FINANCES_SUMMARY_PARK_ENTRANCE_TICKETS = 1901,
+	STR_FINANCES_SUMMARY_RIDE_TICKETS = 1902,
+	STR_FINANCES_SUMMARY_SHOP_SALES = 1903,
+	STR_FINANCES_SUMMARY_SHOP_STOCK = 1904,
+	STR_FINANCES_SUMMARY_FOOD_DRINK_SALES = 1905,
+	STR_FINANCES_SUMMARY_FOOD_DRINK_STOCK = 1906,
+	STR_FINANCES_SUMMARY_STAFF_WAGES = 1907,
+	STR_FINANCES_SUMMARY_MARKETING = 1908,
+	STR_FINANCES_SUMMARY_RESEARCH = 1909,
+	STR_FINANCES_SUMMARY_LOAN_INTEREST = 1910,
+
+	STR_FINANCES_SUMMARY_AT_X_PER_YEAR = 1911,
+	STR_FINANCES_SUMMARY_MONTH_HEADING = 1912,
+	STR_FINANCES_SUMMARY_INCOME_VALUE = 1913,
+	STR_FINANCES_SUMMARY_EXPENDITURE_VALUE = 1914,
+	STR_FINANCES_SUMMARY_LOSS_VALUE = 1915,
+	STR_FINANCES_SUMMARY_LOAN = 1916,
+
+	STR_CANT_BORROW_ANY_MORE_MONEY = 1918,
+	STR_NOT_ENOUGH_CASH_AVAILABLE = 1919,
+	STR_CANT_PAY_BACK_LOAN = 1920,
 
 	STR_START_NEW_GAME_TIP = 1921,
 	STR_CONTINUE_SAVED_GAME_TIP = 1922,
@@ -449,6 +476,11 @@ enum {
 	STR_PARK_RATING_TIP = 2221,
 
 	STR_GUESTS_IN_PARK_LABEL = 2223,
+	STR_CASH_LABEL = 2224,
+	STR_CASH_NEGATIVE_LABEL = 2225,
+	STR_PARK_VALUE_LABEL = 2226,
+	STR_COMPANY_VALUE_LABEL = 2227,
+	STR_LAST_MONTH_PROFIT_FROM_FOOD_DRINK_MERCHANDISE_SALES_LABEL = 2228,
 
 	STR_PARK_INFORMATION_TIP = 2233,
 	STR_RECENT_MESSAGES = 2234,
@@ -474,7 +506,13 @@ enum {
 	STR_RESEARCH_SHOPS_AND_STALLS = 2258,
 	STR_RESEARCH_SCENERY_AND_THEMING = 2259,
 
+	STR_NO_FUNDING = 2260,
+	STR_MINIMUM_FUNDING = 2261,
+	STR_NORMAL_FUNDING = 2262,
+	STR_MAXIMUM_FUNDING = 2263,
+
 	STR_RESEARCH_FUNDING_ = 2264,
+	STR_RESEARCH_COST_PER_MONTH = 2265,
 	STR_RESEARCH_PRIORITIES = 2266,
 
 	STR_FINANCES_RESEARCH = 2275,
@@ -554,8 +592,40 @@ enum {
 	STR_OBJECTIVE_MONTHLY_FOOD_INCOME = STR_OBJECTIVE_NONE + 11,
 
 	STR_MARKETING_CAMPAIGNS_IN_OPERATION = 2409,
+	STR_MARKETING_CAMPAGINS_NONE = 2410,
 	STR_MARKETING_CAMPAIGNS_AVAILABLE = 2411,
 	STR_START_THIS_MARKETING_CAMPAIGN = 2412,
+	STR_MARKETING_PER_WEEK = 2413,
+	STR_MARKETING_NOT_SELECTED = 2414,
+	STR_MARKETING_RIDE = 2415,
+	STR_MARKETING_ITEM = 2416,
+
+	STR_LENGTH_OF_TIME = 2417,
+
+	STR_MARKETING_VOUCHERS_FOR_FREE_ENTRY_TO_THE_PARK = 2424,
+	STR_MARKETING_VOUCHERS_FOR_FREE_RIDES_ON_A_PARTICULAR_RIDE = 2425,
+	STR_MARKETING_VOUCHERS_FOR_HALF_PRICE_ENTRY_TO_THE_PARK = 2426,
+	STR_MARKETING_VOUCHERS_FOR_FREE_FOOD_OR_DRINK = 2427,
+	STR_MARKETING_ADVERTISING_CAMPAIGN_FOR_THE_PARK = 2428,
+	STR_MARKETING_ADVERTISING_CAMPAIGN_FOR_A_PARTICULAR_RIDE = 2429,
+
+	STR_VOUCHERS_FOR_FREE_ENTRY_TO = 2430,
+	STR_VOUCHERS_FOR_FREE_RIDE_ON = 2431,
+	STR_VOUCHERS_FOR_HALF_PRICE_ENTRY_TO = 2432,
+	STR_VOUCHERS_FOR_FREE = 2433,
+	STR_ADVERTISING_CAMPAIGN_FOR_1 = 2434,
+	STR_ADVERTISING_CAMPAIGN_FOR_2 = 2435,
+
+	STR_MARKETING_1_WEEK = 2436,
+	STR_MARKETING_2_WEEKS = 2437,
+	STR_MARKETING_3_WEEKS = 2438,
+	STR_MARKETING_4_WEEKS = 2439,
+	STR_MARKETING_5_WEEKS = 2440,
+	STR_MARKETING_6_WEEKS = 2441,
+	STR_MARKETING_WEEKS_REMAINING = 2442,
+	STR_MARKETING_COST_PER_WEEK = 2443,
+	STR_MARKETING_TOTAL_COST = 2444,
+	STR_MARKETING_START_THIS_MARKETING_CAMPAIGN = 2445,
 
 	STR_MARKETING_FINISHED_BASE = 2446,
 	STR_MARKETING_FINISHED_FREE_ENTRY = 2446,
@@ -565,6 +635,12 @@ enum {
 	STR_MARKETING_FINISHED_PARK_ADS = 2450,
 	STR_MARKETING_FINISHED_RIDE_ADS = 2451,
 
+	STR_FINANCES_FINANCIAL_GRAPH_CASH_LESS_LOAN_POSITIVE = 2452,
+	STR_FINANCES_FINANCIAL_GRAPH_CASH_LESS_LOAN_NEGATIVE = 2453,
+	STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE = 2454,
+	STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE_POSITIVE = 2455,
+	STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE_NEGATIVE = 2456,
+
 	STR_FINANCES_SHOW_SUMMARY_TAB_TIP = 2457,
 	STR_FINANCES_SHOW_CASH_TAB_TIP = 2458,
 	STR_FINANCES_SHOW_PARK_VALUE_TAB_TIP = 2459,
@@ -589,6 +665,8 @@ enum {
 	STR_RESEARCH_NEW_SCENERY_AND_THEMING = 2476,
 
 	STR_PROFIT_PER_WEEK_AND_PARK_VALUE_TIP = 2482,
+	STR_FINANCES_WEEKLY_PROFIT_POSITIVE = 2483,
+	STR_FINANCES_WEEKLY_PROFIT_LOSS = 2484,
 
 	STR_CONTROLS = 2485,
 	STR_GENERAL = 2486,
@@ -596,6 +674,8 @@ enum {
 	STR_REAL_NAME_TIP = 2488,
 	STR_HOTKEY = 2489,
 
+	STR_FINACNES_PARK_VALUE = 2787,
+
 	STR_ENTER_NAME_INTO_SCENARIO_CHART = 2790,
 
 	STR_COMPLETED_BY_WITH_COMPANY_VALUE = 2794,
@@ -667,6 +747,7 @@ enum {
 
 	STR_TUTORIAL = 2856,
 	STR_PRESS_KEY_OR_MOUSE_BUTTON_FOR_CONTROL = 2857,
+	STR_CANT_START_MARKETING_CAMPAIGN = 2858,
 
 	STR_INFOGRAMES_INTERACTIVE_CREDITS = 2860,
 	STR_LICENSED_TO_INFOGRAMES_INTERACTIVE_INC = 2861,