diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt index 58f5ec09dc..7d646b259e 100644 --- a/data/language/english_uk.txt +++ b/data/language/english_uk.txt @@ -4002,7 +4002,6 @@ STR_5660 :Modify Groups STR_5661 :Set Player Group STR_5662 :N/A STR_5663 :Clear Landscape -STR_5664 :Cheat STR_5701 :{WINDOW_COLOUR_2}Last action: {BLACK}{STRINGID} STR_5702 :{SMALLFONT}{BLACK}Locate player's most recent action STR_5703 :Can't kick the host @@ -4039,6 +4038,7 @@ STR_5732 :Anisotropic STR_5733 :Use NN scaling at integer scales # tooltip for tab in options window STR_5734 :{SMALLFONT}{BLACK}Rendering +<<<<<<< HEAD STR_5735 :Network Status STR_5736 :Player STR_5737 :Closed, {COMMA16} person still on ride @@ -4070,6 +4070,20 @@ STR_5762 :Chinese Yuan (CN{YEN}) STR_5763 :All files STR_5764 :Invalid ride type STR_5765 :Cannot edit rides of invalid type +STR_5766 :{SMALLFONT}{BLACK}Paint land height +STR_5767 :Income +STR_5768 :Total customers +STR_5769 :Total profit +STR_5770 :Customers per hour +STR_5771 :Running cost +STR_5772 :Age +STR_5773 :Total customers: {COMMA32} +STR_5774 :Total profit: {CURRENCY2DP} +STR_5775 :Customers: {COMMA32} per hour +STR_5776 :Age: {COMMA16} year(s) +STR_5777 :Income: {CURRENCY2DP} per hour +STR_5778 :Running cost: {CURRENCY2DP} per hour +STR_5779 :Running cost: Unknown ############# # Scenarios # diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h index 227ad31d2a..80ab22ef51 100644 --- a/src/localisation/string_ids.h +++ b/src/localisation/string_ids.h @@ -2342,6 +2342,7 @@ enum { STR_SCALING_QUALITY_ANISOTROPIC = 5732, STR_USE_NN_AT_INTEGER_SCALE = 5733, STR_OPTIONS_RENDERING_TIP = 5734, + STR_PAINT_LAND_HEIGHT = 5735, STR_CLOSED_WITH_PERSON = 5737, STR_CLOSED_WITH_PEOPLE = 5738, @@ -2379,6 +2380,20 @@ enum { STR_INVALID_RIDE_TYPE = 5764, STR_CANT_EDIT_INVALID_RIDE_TYPE = 5765, + STR_RIDE_LIST_INCOME = 5767, + STR_RIDE_LIST_TOTAL_CUSTOMERS = 5768, + STR_RIDE_LIST_TOTAL_PROFIT = 5769, + STR_RIDE_LIST_CUSTOMERS_PER_HOUR = 5770, + STR_RIDE_LIST_RUNNING_COST = 5771, + STR_RIDE_LIST_AGE = 5772, + STR_RIDE_LIST_TOTAL_CUSTOMERS_LABEL = 5773, + STR_RIDE_LIST_TOTAL_PROFIT_LABEL = 5774, + STR_RIDE_LIST_CUSTOMERS_PER_HOUR_LABEL = 5775, + STR_RIDE_LIST_AGE_LABEL = 5776, + STR_RIDE_LIST_INCOME_LABEL = 5777, + STR_RIDE_LIST_RUNNING_COST_LABEL = 5778, + STR_RIDE_LIST_RUNNING_COST_UNKNOWN = 5779, + // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working STR_COUNT = 32768 };