Merge branch 'master' into jgrpp

# Conflicts:
#	src/landscape.cpp
This commit is contained in:
Jonathan G Rennison
2022-10-22 19:52:51 +01:00
3 changed files with 10 additions and 1 deletions

View File

@@ -3158,6 +3158,7 @@ STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Don't hi
STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Highlight coverage area of proposed site
STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepts: {GOLD}{CARGO_LIST}
STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Supplies: {GOLD}{CARGO_LIST}
STR_STATION_BUILD_INFRASTRUCTURE_COST :{BLACK}Maintainance cost: {GOLD}{CURRENCY_SHORT}/yr
# Join station window
STR_JOIN_STATION_CAPTION :{WHITE}Join station