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/cargopacket.h
#	src/cargotype.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/timer/timer_game_common.h
#	src/town.h
This commit is contained in:
Jonathan G Rennison
2024-06-13 20:38:38 +01:00
parent 4b169426dc b2218e75d4
commit de36e9545e
22 changed files with 107 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lang/brazilian_portuguese.txt
View File

@@ -446,7 +446,7 @@ STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE :Configurações
STR_SETTINGS_MENU_AI_SETTINGS :Configurações de IA
STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS :Configurações de Script de Jogo
STR_SETTINGS_MENU_NEWGRF_SETTINGS :Configurações de NewGRF
STR_SETTINGS_MENU_SANDBOX_OPTIONS :Opções de trapaças
STR_SETTINGS_MENU_SANDBOX_OPTIONS :Opções da sandbox
STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS :Opções de transparência
STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED :Mostrar nomes de localidades
STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED :Mostrar nomes de estações
@@ -2242,7 +2242,7 @@ STR_HELP_WINDOW_BUGTRACKER :{BLACK}Relatar
STR_HELP_WINDOW_COMMUNITY :{BLACK}Comunidade
# Cheat window
STR_CHEATS :{WHITE}Trapaças
STR_CHEATS :{WHITE}Opções da Sandbox
STR_CHEAT_MONEY :{LTBLUE}Aumentar dinheiro em {CURRENCY_LONG}
STR_CHEAT_CHANGE_COMPANY :{LTBLUE}Jogando como empresa: {ORANGE}{COMMA}
STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Escavadeira mágica (remove indústrias, objetos estáticos): {ORANGE}{STRING}

5
src/lang/english.txt
View File

@@ -5286,6 +5286,11 @@ STR_ERROR_NO_VEHICLES_AVAILABLE_AT_ALL_EXPLANATION :{WHITE}Change y
STR_ERROR_NO_VEHICLES_AVAILABLE_YET :{WHITE}No vehicles are available yet
STR_ERROR_NO_VEHICLES_AVAILABLE_YET_EXPLANATION :{WHITE}Start a new game after {DATE_SHORT} or use a NewGRF that provides early vehicles
STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_AT_ALL :{WHITE}No town-buildable road types are available
STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_AT_ALL_EXPLANATION :{WHITE}Change your NewGRF configuration
STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_YET :{WHITE}No town-buildable road types are available yet
STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_YET_EXPLANATION :{WHITE}Start a new game after {DATE_SHORT} or use a NewGRF that provides early town-buildable road types
# Specific vehicle errors
STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL :{WHITE}Can't make train pass signal at danger...
STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN :{WHITE}Can't reverse direction of train...