dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/gfx_func.h
#	src/group_gui.cpp
#	src/industry_gui.cpp
#	src/misc_gui.cpp
#	src/news_gui.cpp
#	src/settings_gui.cpp
#	src/ship_gui.cpp
#	src/smallmap_gui.cpp
#	src/station_gui.cpp
#	src/subsidy_gui.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/viewport.cpp
#	src/widget.cpp
#	src/widgets/dropdown.cpp
#	src/window.cpp
This commit is contained in:
Jonathan G Rennison
2023-12-17 01:16:40 +00:00
parent 2267badd28 3902acb13d
commit 2e06374f6f
69 changed files with 525 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/lang/english.txt
View File

@@ -440,31 +440,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Transparent bui
STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Transparent signs
# File menu
###length 5
STR_FILE_MENU_SAVE_GAME :Save game
STR_FILE_MENU_LOAD_GAME :Load game
STR_FILE_MENU_QUIT_GAME :Abandon game
STR_FILE_MENU_SEPARATOR :
STR_FILE_MENU_EXIT :Exit
# Map menu
###length 4
STR_MAP_MENU_MAP_OF_WORLD :Map of world
STR_MAP_MENU_EXTRA_VIEWPORT :Extra viewport
STR_MAP_MENU_LINGRAPH_LEGEND :Cargo flow legend
STR_MAP_MENU_SIGN_LIST :Sign list
# Town menu
###length 2
STR_TOWN_MENU_TOWN_DIRECTORY :Town directory
STR_TOWN_MENU_FOUND_TOWN :Found town
# Subsidies menu
###length 1
STR_SUBSIDIES_MENU_SUBSIDIES :Subsidies
# Graph menu
###length 6
STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Operating profit graph
STR_GRAPH_MENU_INCOME_GRAPH :Income graph
STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Delivered cargo graph
@@ -473,58 +467,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Company value g
STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Cargo payment rates
# Company league menu
###length 3
STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Company league table
STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detailed performance rating
STR_GRAPH_MENU_HIGHSCORE :Highscore table
# Industry menu
###length 3
STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Industry directory
STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Industry chains
STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Fund new industry
# URailway construction menu
###length 4
STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Railway construction
STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Electrified railway construction
STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Monorail construction
STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Maglev construction
# Road construction menu
###length 2
STR_ROAD_MENU_ROAD_CONSTRUCTION :Road construction
STR_ROAD_MENU_TRAM_CONSTRUCTION :Tramway construction
# Waterways construction menu
###length 1
STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Waterways construction
# Aairport construction menu
###length 1
STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Airport construction
# Landscaping menu
###length 3
STR_LANDSCAPING_MENU_LANDSCAPING :Landscaping
STR_LANDSCAPING_MENU_PLANT_TREES :Plant trees
STR_LANDSCAPING_MENU_PLACE_SIGN :Place sign
# Music menu
###length 1
STR_TOOLBAR_SOUND_MUSIC :Sound/music
# Message menu
###length 3
STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Last message/news report
STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Message history
STR_NEWS_MENU_DELETE_ALL_MESSAGES :Delete all messages
# About menu
###length 12
STR_ABOUT_MENU_LAND_BLOCK_INFO :Land area information
STR_ABOUT_MENU_HELP :Help & manuals
STR_ABOUT_MENU_SEPARATOR :
STR_ABOUT_MENU_TOGGLE_CONSOLE :Toggle console
STR_ABOUT_MENU_AI_DEBUG :AI/Game script debug
STR_ABOUT_MENU_SCREENSHOT :Screenshot