1
0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-29 09:29:10 +00:00

Compare commits

..

1 Commits

Author SHA1 Message Date
Richard Wheeler
a5c3f38b58 Change: Update OpenTTD TTF fonts to v0.8
Add new private range special symbols for recent OpenTTD updates: town and city icons for sans (supporting #14504), left arrow for small and sans (supporting #14174). Add Hebrew alphabet to small and serif fonts, for first (beta) support for Hebrew. Fix new shekel glyph height in all fonts. Fix i ogonek right bearing and umlaut alignment in sans font. Fixes #14179
2025-08-28 20:35:17 +01:00
7 changed files with 119 additions and 128 deletions

View File

@@ -49,9 +49,6 @@ struct EndGameHighScoreBaseWindow : Window {
this->DrawWidgets();
/* Fill with the appropriate background colour instead of leaving default window colour */
GfxFillRect(Rect{0, 0, this->width, this->height}, PixelColour{105}, FILLRECT_OPAQUE);
/* Standard background slices are 50 pixels high, but it's designed
* for 480 pixels total. 96% of 500 is 480. */
Dimension dim = GetSpriteSize(this->background_img);

View File

@@ -959,14 +959,11 @@ STR_GAME_OPTIONS_TAB_SOUND :Suono
STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP :Scegliere le impostazioni audio e musicali
STR_GAME_OPTIONS_TAB_SOCIAL :Social
STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP :Scegli le impostazioni di integrazione social
STR_GAME_OPTIONS_TAB_ADVANCED :Avanzate
STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP :Cambia impostazioni avanzate
STR_GAME_OPTIONS_VOLUME :Volume
STR_GAME_OPTIONS_SFX_VOLUME :Effetti sonori
STR_GAME_OPTIONS_MUSIC_VOLUME :Musica
STR_GAME_OPTIONS_SETTING :{STRING}: {ORANGE}{STRING}
STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :Valuta
@@ -1019,8 +1016,6 @@ STR_GAME_OPTIONS_CURRENCY_IDR :Rupia indonesia
STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit malaysiano
STR_GAME_OPTIONS_CURRENCY_LVL :Lats lettoni
STR_GAME_OPTIONS_CURRENCY_PTE :Escudo portoghese
STR_GAME_OPTIONS_CURRENCY_UAH :Grivna Ucraina
STR_GAME_OPTIONS_CURRENCY_VND :Dong Vietnamita
STR_GAME_OPTIONS_AUTOSAVE_FRAME :Salvataggi automatici
STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :Seleziona l'intervallo fra i salvataggi automatici della partita
@@ -1054,7 +1049,6 @@ STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP :Seleziona quest
STR_GAME_OPTIONS_VIDEO_DRIVER_INFO :Driver attuale: {STRING}
STR_GAME_OPTIONS_INTERFACE :Interfaccia
STR_GAME_OPTIONS_GUI_SCALE_FRAME :Dimensione dell'interfaccia
STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP :Trascinare il cursore per impostare le dimensioni dell'interfaccia. Ctrl+trascina per una regolazione continua
@@ -1079,7 +1073,6 @@ STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP :Apre un browser
STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW :Anteprima del risultato del sondaggio
STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP :Mostra il risultato del sondaggio della partita in corso
STR_GAME_OPTIONS_DISPLAY :Mostra
STR_GAME_OPTIONS_REFRESH_RATE :Frequenza di aggiornameno dello schermo
STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP :Seleziona la frequenza di aggiornamento dello schermo da utilizzare
@@ -1695,8 +1688,6 @@ STR_CONFIG_SETTING_SCROLLMODE_LMB :Muovi mappa col
STR_CONFIG_SETTING_SMOOTH_SCROLLING :Scorrimento morbido delle visuali: {STRING}
STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT :Controlla il modo in cui la visuale principale scorre verso una specifica posizione quando si fa clic sulla minimappa o si ordina di visualizzare un oggetto specifico sulla mappa. Se abilitata, la visuale scorre in modo morbido. Se disabilitata, salta direttamente al punto prescelto
STR_CONFIG_SETTING_TOOLBAR_DROPDOWN_AUTOSELECT :Comportamento tradizionale di selezione dei menu della barra degli strumenti: {STRING}
STR_CONFIG_SETTING_TOOLBAR_DROPDOWN_AUTOSELECT_HELPTEXT :Scegli il comportamento di selezione dei menu della barra degli strumenti. Se disattivato, l'elenco dei menu della barra degli strumenti rimarrà aperto finché non si effettua una selezione. Se attivato, si apre il menu su cui si trova il puntatore al rilascio del pulsante del mouse.
STR_CONFIG_SETTING_MEASURE_TOOLTIP :Mostra un tooltip di misura durante la costruzione: {STRING}
STR_CONFIG_SETTING_MEASURE_TOOLTIP_HELPTEXT :Mostra le distanze in caselle e le differenze di altezza quando si trascina durante le operazioni di costruzione
@@ -2906,7 +2897,6 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD :{BLACK}Costruis
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM :{BLACK}Costruisce sezioni di tranvia usando la modalità automatica. Ctrl+Clic per rimuovere la sezione tranviaria. Premere anche Shift per visualizzare solo la stima dei costi
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Costruisce un deposito automezzi (per comprare e manutenere i veicoli). Premere anche Shift per visualizzare solo la stima dei costi
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Costruisce un deposito tranviario (per comprare e manutenere i veicoli). Premere anche Shift per mostrare solo la stima dei costi
STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}Costruisce un waypoint sulla strada. Ctrl+Clic per selezionare un altro waypoint da unire. Premere anche Shift per mostrare solo la stima dei costi
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION :{BLACK}Costruisce una stazione degli autobus. Ctrl+Clic per selezionare un'altra stazione da unire. Premere anche Shift per visualizzare solo la stima dei costi
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION :{BLACK}Costruisce la stazione del tram passeggeri. Ctrl+Clic per selezionare un'altra stazione da unire. Premere anche Shift per visualizzare solo la stima dei costi
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY :{BLACK}Costruisce una stazione dei camion. Ctrl+Clic per selezionare un'altra stazione da unire. Premere anche Shift per visualizzare solo la stima dei costi
@@ -5280,8 +5270,6 @@ STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}Impossib
###length VEHICLE_TYPES
###length VEHICLE_TYPES
STR_ERROR_CAN_T_AUTOREPLACE_ROAD_VEHICLE :{WHITE}Non puoi rimpiazzare automaticamente gli autoveicoli...
STR_ERROR_CAN_T_AUTOREPLACE_AIRCRAFT :{WHITE}Non puoi rimpiazzare automaticamente l'aeromobile...
STR_ERROR_TOO_MANY_VEHICLES_IN_GAME :{WHITE}Troppi veicoli nel gioco
STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Impossibile cambiare l'intervallo di manutenzione...

View File

@@ -382,7 +382,7 @@ STR_GOTO_ORDER_VIEW_TOOLTIP :{BLACK}Huakina
# Tooltips for the main toolbar
###length 31
STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Whakaokiokitia te kēmu
STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Rere whakamua i te kēmu
STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Rere Whakamua i te kēmu
STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Kōwhiringa me ngā tautuhinga
STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME :{BLACK}Puritia, utaina, waihotia rānei te kēmu, puta atu rānei i te taupānga
STR_TOOLBAR_TOOLTIP_DISPLAY_MAP :{BLACK}Huakina he mahere, he tirohanga tāpiri, he hoahoa rerenga utanga, he rārangi tohu rānei
@@ -709,7 +709,7 @@ STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP :{BLACK}Whiwhing
# Music window
STR_MUSIC_JAZZ_JUKEBOX_CAPTION :{WHITE}Whakatangi Rekoata
STR_MUSIC_PLAYLIST_ALL :{TINY_FONT}{BLACK}Katoa
STR_MUSIC_PLAYLIST_OLD_STYLE :{TINY_FONT}{BLACK}Tāera Tawhito
STR_MUSIC_PLAYLIST_OLD_STYLE :{TINY_FONT}{BLACK}Tāera tawhito
STR_MUSIC_PLAYLIST_NEW_STYLE :{TINY_FONT}{BLACK}Tāera Hou
STR_MUSIC_PLAYLIST_EZY_STREET :{TINY_FONT}{BLACK}Tiritimāmā
STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINY_FONT}{BLACK}Whaiaro 1
@@ -981,7 +981,7 @@ STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP :Kōwhiria ngā
STR_GAME_OPTIONS_TAB_SOCIAL :Pāpori
STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP :Kōwhiri ngā tautuhinga whakauruuru pāpori
STR_GAME_OPTIONS_TAB_ADVANCED :Matatau
STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP :Panoni ngā tautuhinga mō ngā kaiwhakamahi matatau
STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP :Panoni tautuhinga mō ngā kaiwhakamahi matatau
STR_GAME_OPTIONS_VOLUME :Kahaoro
STR_GAME_OPTIONS_SFX_VOLUME :Orotaunaki
@@ -1120,7 +1120,7 @@ STR_GAME_OPTIONS_BASE_MUSIC :Kohinga pūoro
STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :Kōwhiria te kohinga pūoro mātāmua
STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :Pārongo tāpiri mō te kohinga pūoro mātāmua
STR_GAME_OPTIONS_ONLINE_CONTENT :Tīkina ētahi atu huānga
STR_GAME_OPTIONS_ONLINE_CONTENT :Tīkina ētahi Atu Huānga
STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP :Rapua he huānga hou hei tikiake
STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE :(kāore he taupānga uruuru i te tāutangia hei whakauruuru ki ngā pae pāpori)
@@ -1171,7 +1171,7 @@ STR_CURRENCY_CHANGE_PARAMETER :{BLACK}Panoniti
STR_NONE :Kore
STR_FUNDING_ONLY :Whakarato moni anake
STR_MINIMAL :Mōkito
STR_NUM_VERY_LOW :Iti rawa
STR_NUM_VERY_LOW :Iti Rawa
STR_NUM_LOW :Iti
STR_NUM_NORMAL :Māori
STR_NUM_HIGH :Nui
@@ -1179,21 +1179,21 @@ STR_NUM_CUSTOM :Tautuhi
STR_NUM_CUSTOM_NUMBER :Tautuhi ({NUM})
STR_VARIETY_NONE :Kore
STR_VARIETY_VERY_LOW :Iti rawa
STR_VARIETY_VERY_LOW :Iti Rawa
STR_VARIETY_LOW :Iti
STR_VARIETY_MEDIUM :Wawaenga
STR_VARIETY_HIGH :Nui
STR_VARIETY_VERY_HIGH :Nui rawa
STR_VARIETY_VERY_HIGH :Nui Rawa
###length 5
STR_AI_SPEED_VERY_SLOW :Pōturi rawa
STR_AI_SPEED_VERY_SLOW :Pōturi Rawa
STR_AI_SPEED_SLOW :Pōturi
STR_AI_SPEED_MEDIUM :Wawaenga
STR_AI_SPEED_FAST :Tere
STR_AI_SPEED_VERY_FAST :Tere rawa
STR_AI_SPEED_VERY_FAST :Tere Rawa
###length 6
STR_SEA_LEVEL_VERY_LOW :Poto rawa
STR_SEA_LEVEL_VERY_LOW :Poto Rawa
STR_SEA_LEVEL_LOW :Poto
STR_SEA_LEVEL_MEDIUM :Wawaenga
STR_SEA_LEVEL_HIGH :Teitei
@@ -1224,7 +1224,7 @@ STR_CLIMATE_SUB_TROPICAL_LANDSCAPE :Taiao wera
STR_CLIMATE_TOYLAND_LANDSCAPE :Taiao taonga tākaro
###length 7
STR_TERRAIN_TYPE_VERY_FLAT :Papatahi rawa
STR_TERRAIN_TYPE_VERY_FLAT :Papatahi Rawa
STR_TERRAIN_TYPE_FLAT :Papatahi
STR_TERRAIN_TYPE_HILLY :Pukepuke
STR_TERRAIN_TYPE_MOUNTAINOUS :Maunga
@@ -1619,10 +1619,10 @@ STR_CONFIG_SETTING_DESERT_COVERAGE_VALUE :{NUM}%
STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN :Tuarangaranga o te whenua: {STRING}
STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_HELPTEXT :Kōwhiria te hanga me te tatau o ngā puke. He puke whānui kei te whenua mōhanihani, he maha o ngā puke iti kei te whenua tuarangaranga
###length 4
STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH :Mōhanihani rawa
STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH :Mōhanihani Rawa
STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_SMOOTH :Mōhanihani
STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_ROUGH :Tuarangaranga
STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_ROUGH :Tuarangaranga rawa
STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_ROUGH :Tuarangaranga Rawa
STR_CONFIG_SETTING_VARIETY :Tuari matatini: {STRING}
STR_CONFIG_SETTING_VARIETY_HELPTEXT :Kōwhiri mehemea he maunga, he wāhi papatahi hoki kei te mahere. Ka nui atu te matatini, ka nui atu ngā rerekētanga i te teitei i waenga i ngā maunga me ngā wāhi papatahi
@@ -1690,8 +1690,6 @@ STR_CONFIG_SETTING_SCROLLMODE_LMB :Nekehia te mahe
STR_CONFIG_SETTING_SMOOTH_SCROLLING :Panuku tirohanga mōhanihani: {STRING}
STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT :Tautuhitia me pēwhea te panuku a te tirohanga matua ki tētahi tauwāhi ina pāwhiri ki te mahereiti, ina tono rānei kia panuku ki tētahi mea i te mahere. Ina kā, ka mōhanihani te panuku a te tirohanga, ina poko, ka peke ki te keo pū
STR_CONFIG_SETTING_TOOLBAR_DROPDOWN_AUTOSELECT :Whanonga taketake o te tīpakonga tahua i te pae utauta: {STRING}
STR_CONFIG_SETTING_TOOLBAR_DROPDOWN_AUTOSELECT_HELPTEXT :Kōwhiria te whanonga mō te tīpakonga tahua i te pae utauta. Ina poko, ka tuwhera tonu ngā tahua tae noa ki tētahi tīpakonga. Ina kā, ka tīpakona te kōwhiringa i te tuku i te pātene o te kiore.
STR_CONFIG_SETTING_MEASURE_TOOLTIP :Whakaaria he whakamāramatanga hunahuna ina whakamahia ētahi taputapu hangahanga: {STRING}
STR_CONFIG_SETTING_MEASURE_TOOLTIP_HELPTEXT :Whakaaria ngā tawhiti o ngā papariki me ngā rerekētanga i te teitei ina tō i ngā mahi hangahanga
@@ -2163,7 +2161,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Ingarangi (ft)
STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Ngahuru (m)
STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m)
STR_CONFIG_SETTING_LOCALISATION :Kōwhiringa ā-rohe
STR_CONFIG_SETTING_LOCALISATION :Whakamāoritanga
STR_CONFIG_SETTING_GRAPHICS :Whakairoiro
STR_CONFIG_SETTING_SOUND :Oro
STR_CONFIG_SETTING_INTERFACE :Tāhono
@@ -2223,10 +2221,10 @@ STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH :{WHITE}... i wh
STR_INTRO_CAPTION :{WHITE}OpenTTD
STR_INTRO_VERSION :OpenTTD {REV}
STR_INTRO_NEW_GAME :{BLACK}Kēmu hou
STR_INTRO_LOAD_GAME :{BLACK}Utaina he kēmu
STR_INTRO_PLAY_SCENARIO :{BLACK}Tākaro i tētahi takiwā
STR_INTRO_PLAY_HEIGHTMAP :{BLACK}Tākaro i tētahi mahereteitei
STR_INTRO_NEW_GAME :{BLACK}Kēmu Hou
STR_INTRO_LOAD_GAME :{BLACK}Utaina he Kēmu
STR_INTRO_PLAY_SCENARIO :{BLACK}Tākaro i tētahi Takiwā
STR_INTRO_PLAY_HEIGHTMAP :{BLACK}Tākaro i tētahi Mahereteitei
STR_INTRO_SCENARIO_EDITOR :{BLACK}Pūtakatā Takiwā
STR_INTRO_MULTIPLAYER :{BLACK}Kaitākarorau
@@ -2269,17 +2267,17 @@ STR_ABANDON_GAME_QUERY :{YELLOW}Kei te
STR_ABANDON_SCENARIO_QUERY :{YELLOW}Kei te tino hiahia rānei koe ki te waiho i tēnei takiwā?
# Help window
STR_HELP_WINDOW_CAPTION :{WHITE}Āwhina & puka āwhina
STR_HELP_WINDOW_CAPTION :{WHITE}Āwhina & Puka Āwhina
STR_HELP_WINDOW_WEBSITES :{BLACK}Paetukutuku
STR_HELP_WINDOW_DOCUMENTS :{BLACK}Tuhinga
STR_HELP_WINDOW_README :{BLACK}Kōnae pānuimai
STR_HELP_WINDOW_CHANGELOG :{BLACK}Pānui panoni
STR_HELP_WINDOW_KNOWN_BUGS :{BLACK}Iro e mōhiotia nei
STR_HELP_WINDOW_README :{BLACK}Kōnae Pānuimai
STR_HELP_WINDOW_CHANGELOG :{BLACK}Pānui Panoni
STR_HELP_WINDOW_KNOWN_BUGS :{BLACK}Iro e Mōhiotia Nei
STR_HELP_WINDOW_LICENSE :{BLACK}Raihana
STR_HELP_WINDOW_FONTS :{BLACK}Momotuhi
STR_HELP_WINDOW_MAIN_WEBSITE :{BLACK}OpenTTD
STR_HELP_WINDOW_MANUAL_WIKI :{BLACK}Puka āwhina / mātāpunenga
STR_HELP_WINDOW_BUGTRACKER :{BLACK}Pūrongotia mai he iro
STR_HELP_WINDOW_MANUAL_WIKI :{BLACK}Puka Āwhina / Mātāpunenga
STR_HELP_WINDOW_BUGTRACKER :{BLACK}Pūrongotia Mai he Iro
STR_HELP_WINDOW_COMMUNITY :{BLACK}Hapori
# Cheat window
@@ -2346,7 +2344,7 @@ STR_FACE_CAPTION :{WHITE}Tīpakon
STR_FACE_CANCEL_TOOLTIP :{BLACK}Whakakorea te tīpakonga mata hou
STR_FACE_OK_TOOLTIP :{BLACK}Whakaaetia te tīpakonga mata hou
STR_FACE_NEW_FACE_BUTTON :{BLACK}Mata hou
STR_FACE_NEW_FACE_BUTTON :{BLACK}Mata Hou
STR_FACE_NEW_FACE_TOOLTIP :{BLACK}Hangaia he mata matapōkere
STR_FACE_ADVANCED :{BLACK}Matatau
STR_FACE_ADVANCED_TOOLTIP :{BLACK}Tīpakonga mata matatau
@@ -2400,11 +2398,11 @@ STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP :{BLACK}Ngā kir
STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT :{BLACK}{COMMA}x{COMMA}
STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION :{BLACK}Rahi o te mahere
STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP :{BLACK}Te rahi o te mahere o te kēmu{}Pāwhiria kia raupapa ki te horahanga
STR_NETWORK_SERVER_LIST_DATE_CAPTION :{BLACK}Tau
STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP :{BLACK}Te tau nei
STR_NETWORK_SERVER_LIST_DATE_CAPTION :{BLACK}
STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP :{BLACK}Te nei
STR_NETWORK_SERVER_LIST_PLAY_TIME_SHORT :{BLACK}{NUM}h {NUM}m
STR_NETWORK_SERVER_LIST_PLAY_TIME_CAPTION :{BLACK}Wā kua tākaro ai
STR_NETWORK_SERVER_LIST_PLAY_TIME_CAPTION_TOOLTIP :{BLACK}Wā kua tākaro ai{}kāore te kēmu i okioki
STR_NETWORK_SERVER_LIST_PLAY_TIME_CAPTION_TOOLTIP :{BLACK}Wā kua tākaro ai i{}kore te kēmu i okioki
STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP :{BLACK}Hototahi tūmau me te pārongo motuhēhēnga
STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT :{BLACK}Pāwhiria he kēmu nō te rārangi kia tīpakona
@@ -3122,7 +3120,7 @@ STR_INDUSTRY_CARGOES_CUSTOMERS :{WHITE}Ahumahi
STR_INDUSTRY_CARGOES_HOUSES :{WHITE}Whare
STR_INDUSTRY_CARGOES_INDUSTRY_TOOLTIP :{BLACK}Pāwhiria te ahumahi kia kite i ana kaiwhakarato me ana kiritaki
STR_INDUSTRY_CARGOES_CARGO_TOOLTIP :{BLACK}{STRING}{}Pāwhiria te utanga kia kite i ana kaiwhakarato me ana kiritaki
STR_INDUSTRY_DISPLAY_CHAIN :{BLACK}Ara tukutuku
STR_INDUSTRY_DISPLAY_CHAIN :{BLACK}Ara Tukutuku
STR_INDUSTRY_DISPLAY_CHAIN_TOOLTIP :{BLACK}Whakaaria ngā ahumahi ka whakaputa utanga, whiwhi utanga hoki
STR_INDUSTRY_CARGOES_NOTIFY_SMALLMAP :{BLACK}Honoa ki te mahereiti
STR_INDUSTRY_CARGOES_NOTIFY_SMALLMAP_TOOLTIP :{BLACK}Tīpakona ngā ahumahi e whakaaria ana i te mahereiti hoki
@@ -3330,7 +3328,7 @@ STR_SAVELOAD_LOAD_HEIGHTMAP :{WHITE}Utaina h
STR_SAVELOAD_SAVE_HEIGHTMAP :{WHITE}Puritia te Mahereteitei
STR_SAVELOAD_LOAD_TOWN_DATA :{WHITE}Uta Raraunga Tāone
STR_SAVELOAD_HOME_BUTTON_TOOLTIP :{BLACK}Pāwhiri nei kia peke ki te tātai pupuri/uta taunoa nei
STR_SAVELOAD_BYTES_FREE :{BLACK}{BYTES} e wātea nei
STR_SAVELOAD_BYTES_FREE :{BLACK}{BYTES} wātea
STR_SAVELOAD_LIST_TOOLTIP :{BLACK}He rārangi o ngā puku, ngā tātai, me ngā kōnae pupuri kēmu
STR_SAVELOAD_EDITBOX_TOOLTIP :{BLACK}Te ingoa e tīpakona nei mō te kōnae pupuri
STR_SAVELOAD_DELETE_BUTTON :{BLACK}Muku
@@ -3457,7 +3455,7 @@ STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT :{WHITE}Panoniti
# Map generation progress
STR_GENERATION_WORLD :{WHITE}Kei te Hanga i te Ao...
STR_GENERATION_ABORT :{BLACK}Mutu
STR_GENERATION_ABORT_CAPTION :{WHITE}Whakamutua te hanga i te ao
STR_GENERATION_ABORT_CAPTION :{WHITE}Whakamutua te Hanga i te Ao
STR_GENERATION_ABORT_MESSAGE :{YELLOW}Kei te tino hiahia rānei koe ki te whakamutu i te hanga i te ao?
STR_GENERATION_PROGRESS :{WHITE}{NUM}% ki te otinga
STR_GENERATION_PROGRESS_NUM :{BLACK}{NUM} / {NUM}
@@ -3707,10 +3705,10 @@ STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED :{BLACK}Ka tupu
STR_TOWN_VIEW_TOWN_GROW_STOPPED :{RED}Kāore{BLACK} te tāone i te tupu
STR_TOWN_VIEW_NOISE_IN_TOWN :{BLACK}Tepe turituri i roto i te tāone: {ORANGE}{COMMA}{BLACK} mōrahi: {ORANGE}{COMMA}
STR_TOWN_VIEW_CENTER_TOOLTIP :{BLACK}Nekehia te tirohanga matua ki te tauwāhi o te tāone. Pātaki+Pāwhiri kia huaki i tētahi atu tirohanga i te tauwāhi o te tāone
STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON :{BLACK}Kāwanatanga ā-rohe
STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON :{BLACK}Kāwanatanga Ā-rohe
STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP :{BLACK}Whakaaturia he pārongo mō te kāwanatanga ā-rohe
STR_TOWN_VIEW_RENAME_TOOLTIP :{BLACK}Panonitia te ingoa o te tāone
STR_TOWN_VIEW_CARGO_GRAPH :Kauwhata utanga
STR_TOWN_VIEW_CARGO_GRAPH :Kauwhata Utanga
STR_TOWN_VIEW_CARGO_GRAPH_TOOLTIP :Whakaaria he kauwhata o te hītori o te utanga o te tāone
STR_TOWN_VIEW_EXPAND_BUTTON :{BLACK}Whakamakoha
@@ -3722,7 +3720,7 @@ STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP :{BLACK}Whakarah
STR_TOWN_VIEW_DELETE_BUTTON :{BLACK}Muku
STR_TOWN_VIEW_DELETE_TOOLTIP :{BLACK}Muku katoatia tēnei tāone
STR_TOWN_VIEW_RENAME_TOWN_BUTTON :Tapaia anō te tāone
STR_TOWN_VIEW_RENAME_TOWN_BUTTON :Tapaia Anō te Tāone
# Town local authority window
STR_LOCAL_AUTHORITY_CAPTION :{WHITE}Kāwanatanga ā-rohe o {TOWN}
@@ -3883,13 +3881,13 @@ STR_STATION_VIEW_GROUP_D_V_S :Ūnga-Autaki-P
###length 8
STR_CARGO_RATING_APPALLING :Whakarihariha
STR_CARGO_RATING_VERY_POOR :Kino rawa
STR_CARGO_RATING_VERY_POOR :Kino Rawa
STR_CARGO_RATING_POOR :Kino
STR_CARGO_RATING_MEDIOCRE :Ehara i te kino
STR_CARGO_RATING_MEDIOCRE :Ehara i te Kino
STR_CARGO_RATING_GOOD :Pai
STR_CARGO_RATING_VERY_GOOD :Pai rawa
STR_CARGO_RATING_VERY_GOOD :Pai Rawa
STR_CARGO_RATING_EXCELLENT :Rawe
STR_CARGO_RATING_OUTSTANDING :Kei runga rawa atu
STR_CARGO_RATING_OUTSTANDING :Kei Runga Rawa Atu
STR_STATION_VIEW_CENTER_TOOLTIP :{BLACK}Nekehia te tirohanga matua ki te tauwāhi o te teihana. Pātaki+Pāwhiri kia huaki i tētahi atu tirohanga i te tauwāhi o te teihana
STR_STATION_VIEW_RENAME_TOOLTIP :{BLACK}Panonitia te ingoa o te teihana
@@ -3952,7 +3950,7 @@ STR_FINANCES_INTEREST_RATE :{WHITE}Huamoni
STR_FINANCES_MAX_LOAN :{WHITE}Moni Taurewa Mōrahi: {BLACK}{CURRENCY_LONG}
STR_FINANCES_TOTAL_CURRENCY :{BLACK}{CURRENCY_LONG}
STR_FINANCES_BANK_BALANCE :{WHITE}{CURRENCY_LONG}
STR_FINANCES_BORROW_BUTTON :{BLACK}Minoa {CURRENCY_LONG}
STR_FINANCES_BORROW_BUTTON :{BLACK}Mino {CURRENCY_LONG}
STR_FINANCES_BORROW_TOOLTIP :{BLACK}Whakarahia te moni taurewa. Pātaki+Pāwhiri kia mino i te tatau mōrahi
STR_FINANCES_REPAY_BUTTON :{BLACK}Whakaeatia te {CURRENCY_LONG}
STR_FINANCES_REPAY_TOOLTIP :{BLACK}Whakaeatia he wāhi o te moni taurewa. Pātaki+Pāwhiri kia whakaeatia te tatau mōrahi o te moni taurewa
@@ -3993,13 +3991,13 @@ STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Hoatu mo
STR_COMPANY_VIEW_HOSTILE_TAKEOVER_BUTTON :{BLACK}Hoko kaitaua mai
STR_COMPANY_VIEW_HOSTILE_TAKEOVER_TOOLTIP :{BLACK}Hokona mai tēnei umanga
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Mata hou
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Mata Hou
STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Tīpakona he mata hou mō te kaiwhakahaere
STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Kohinga kara
STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Kohinga Kara
STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP :{BLACK}Panonitia te peita waka o te umanga
STR_COMPANY_VIEW_COMPANY_NAME_BUTTON :{BLACK}Ingoa o te umanga
STR_COMPANY_VIEW_COMPANY_NAME_BUTTON :{BLACK}Ingoa o te Umanga
STR_COMPANY_VIEW_COMPANY_NAME_TOOLTIP :{BLACK}Panonitia te ingoa o te umanga
STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON :{BLACK}Ingoa o te kaiwhakahaere
STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON :{BLACK}Ingoa o te Kaiwhakahaere
STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP :{BLACK}Panonitia te ingoa o te kaiwhakahaere
STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION :Ingoa o te Umanga
@@ -4019,7 +4017,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT :{GOLD}Papariki
STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS :{WHITE}Awa
STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT :{GOLD}Teihana:
STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Papariki teihana
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Taunga rererangi
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Taunga Rererangi
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENCY_LONG}/tau
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/wā
@@ -4044,7 +4042,7 @@ STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE :{BLACK}Whakaput
STR_INDUSTRY_VIEW_PRODUCTION_LAST_MINUTE_TITLE :{BLACK}Whakaputa i tērā meneti:
STR_INDUSTRY_VIEW_TRANSPORTED :{YELLOW}{CARGO_LONG}{STRING}{BLACK} ({COMMA}% kua kawea)
STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}Nekehia te tirohanga matua ki te tauwāhi o te ahumahi. Pātaki+Pāwhiri kia huaki i tētahi atu tirohanga i te tauwāhi o te ahumahi
STR_INDUSTRY_VIEW_CARGO_GRAPH :{BLACK}Kauwhata utanga
STR_INDUSTRY_VIEW_CARGO_GRAPH :{BLACK}Kauwhata Utanga
STR_INDUSTRY_VIEW_CARGO_GRAPH_TOOLTIP :{BLACK}Ka whakaaria te kauwhata o te hītori o te utanga o te ahumahi
STR_INDUSTRY_VIEW_PRODUCTION_LEVEL :{BLACK}Kōeke whakaputa: {YELLOW}{COMMA}%
STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE :{YELLOW}Kua pānui te ahumahi ka katia ākuanei!
@@ -4076,10 +4074,10 @@ STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Kaipuke
STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Waka rererangi - pāwhiria te waka mō te pārongo. Puritia te Pātaki+Pāhiki kia paparuatia te momo utanga
###length VEHICLE_TYPES
STR_VEHICLE_LIST_AVAILABLE_TRAINS :Tereina e wātea ana
STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES :Waka e wātea ana
STR_VEHICLE_LIST_AVAILABLE_SHIPS :Kaipuke e wātea ana
STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT :Waka e wātea ana
STR_VEHICLE_LIST_AVAILABLE_TRAINS :Tereina e Wātea ana
STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES :Waka e Wātea ana
STR_VEHICLE_LIST_AVAILABLE_SHIPS :Kaipuke e Wātea ana
STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT :Waka e Wātea ana
STR_VEHICLE_LIST_MANAGE_LIST :{BLACK}Whakahaerea te rārangi
STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP :{BLACK}Tuku tohutohu ki ngā waka katoa i roto i tēnei rārangi
@@ -4196,16 +4194,16 @@ STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Rārangi
STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP :{BLACK}Rārangi tīpako waka rererangi. Pāwhiria he waka rererangi mō te pārongo. Pātaki+Pāwhiri kia whakaari/huna i tēnei momo waka
###length VEHICLE_TYPES
STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON :{BLACK}Hokona mai te waka
STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON :{BLACK}Hokona mai te waka
STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON :{BLACK}Hokona mai te waka
STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON :{BLACK}Hokona mai te waka
STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON :{BLACK}Hokona Mai te Waka
STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON :{BLACK}Hokona Mai te Waka
STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON :{BLACK}Hokona Mai te Waka
STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON :{BLACK}Hokona Mai te Waka
###length VEHICLE_TYPES
STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Hokona mai te waka, hanga urutau
STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Hokona mai te waka, hanga urutau
STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Hokona mai te waka, hanga urutau
STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Hokona mai te waka, hanga urutau
STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Hokona Mai te Waka ka Hanga Urutau Ai
STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Hokona Mai te Waka ka Hanga Urutau Ai
STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Hokona Mai te Waka ka Hanga Urutau Ai
STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Hokona Mai te Waka ka Hanga Urutau Ai
###length VEHICLE_TYPES
STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP :{BLACK}Hokona mai te waka rerewhenua e miramiratia nei. Pēhi hoki i te Pāhiki kia whakaatu noa iho i te whakataunga tata o te utu
@@ -4291,10 +4289,10 @@ STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP :{BLACK}Whakakap
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP :{BLACK}Whakakapi aunoatia ngā waka rererangi katoa i te taupuni
###length VEHICLE_TYPES
STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Waka hou
STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON :{BLACK}Waka hou
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Waka hou
STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON :{BLACK}Waka hou
STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Waka Hou
STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON :{BLACK}Waka Hou
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Waka Hou
STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON :{BLACK}Waka Hou
###length VEHICLE_TYPES
STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}Hokona mai he waka rerewhenua hou
@@ -4303,10 +4301,10 @@ STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Hokona m
STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Hokona mai he waka rererangi hou
###length VEHICLE_TYPES
STR_DEPOT_CLONE_TRAIN :{BLACK}Pūruatia he tereina
STR_DEPOT_CLONE_ROAD_VEHICLE :{BLACK}Pūruatia he waka
STR_DEPOT_CLONE_SHIP :{BLACK}Pūruatia he kaipuke
STR_DEPOT_CLONE_AIRCRAFT :{BLACK}Pūruatia he waka rererangi
STR_DEPOT_CLONE_TRAIN :{BLACK}Pūruatia he Tereina
STR_DEPOT_CLONE_ROAD_VEHICLE :{BLACK}Pūruatia he Waka
STR_DEPOT_CLONE_SHIP :{BLACK}Pūruatia he Kaipuke
STR_DEPOT_CLONE_AIRCRAFT :{BLACK}Pūruatia he Waka Rererangi
###length VEHICLE_TYPES
STR_DEPOT_CLONE_TRAIN_DEPOT_TOOLTIP :{BLACK}Hokona mai he tārua o tētahi tereina me ana wākena. Pāwhiria tēnei pātene, ā, pāwhiria he tereina kei roto, kei waho rānei i te taupuni. Pātaki+Pāwhiri kia toha i ngā rārangi mahi. Pēhi hoki i te Pāhiki kia whakaatu noa iho i te whakataunga tata o te utu
@@ -4384,14 +4382,14 @@ STR_REPLACE_VEHICLE_AIRCRAFT :Waka Rererangi
STR_REPLACE_LEFT_ARRAY_TOOLTIP :{BLACK}Tīpakona te momo pūkaha ka hiahia koe kia whakakapia
STR_REPLACE_RIGHT_ARRAY_TOOLTIP :{BLACK}Tīpakona te momo pūkaha hou ka hiahia koe kia whakakapi i te momo pūkaha kua tīpakona i te mauī
STR_REPLACE_VEHICLES_START :{BLACK}Tīmatahia te whakakapi waka
STR_REPLACE_VEHICLES_START :{BLACK}Tīmatahia te Whakakapi Waka
STR_REPLACE_VEHICLES_NOW :Whakakapia ngā waka katoa ināianei
STR_REPLACE_VEHICLES_WHEN_OLD :Whakakapia ngā waka tawhito anake
STR_REPLACE_START_BUTTON_TOOLTIP :{BLACK}Pāwhiri kia tīmatahia te whakakapi i te momo pūkaha kua tīpakona i te mauī ki te momo pūkaha kua tīpakona i te matau
STR_REPLACE_NOT_REPLACING :{BLACK}Kāore e whakakapia
STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED :{BLACK}Kāore he waka i te tīpakona
STR_REPLACE_REPLACING_WHEN_OLD :{ENGINE} ina tawhito
STR_REPLACE_VEHICLES_STOP :{BLACK}Whakamutua te whakakapi waka
STR_REPLACE_VEHICLES_STOP :{BLACK}Whakamutua te Whakakapi Waka
STR_REPLACE_STOP_BUTTON_TOOLTIP :{BLACK}Pāwhiri kia whakamutu i te whakakapi i te momo pūkaha kua tīpakona i te mauī
STR_REPLACE_ENGINE_WAGON_SELECT_TOOLTIP :{BLACK}Whakawhitia ngā matapihi whakakapi waka
@@ -4805,28 +4803,28 @@ STR_TIMETABLE_STATUS_NOT_STARTED :{BLACK}Kāore a
STR_TIMETABLE_STATUS_START_AT_DATE :{BLACK}Ka tīmata tēnei wātaka i te {STRING}
STR_TIMETABLE_STATUS_START_IN_SECONDS :{BLACK}Ka tīmata tēnei wātaka i te {COMMA} hēkena
STR_TIMETABLE_START :{BLACK}Tīmatahia te wātaka
STR_TIMETABLE_START :{BLACK}Tīmatahia te Wātaka
STR_TIMETABLE_START_TOOLTIP :{BLACK}Tīpakona te wā me tīmata ai tēnei wātaka. Pātaki+Pāwhiri kia hora riterite i ngā tīmata a ngā waka katoa e toha ana i tēnei mahi, mehemea kua whakarite katoatia ngā mahi
STR_TIMETABLE_START_SECONDS_QUERY :Hēkena ki te tīmata o te wātaka
STR_TIMETABLE_CHANGE_TIME :{BLACK}Panonitia te wā
STR_TIMETABLE_CHANGE_TIME :{BLACK}Panonitia te Wā
STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Panonitia te wā me tae ai te waka mō te mahi kua miramiratia. Pātaki+Pāwhiri kia tautuhitia te wā mō ngā mahi katoa
STR_TIMETABLE_CHANGE_TIME_QUERY :Panonitia te wā
STR_TIMETABLE_CLEAR_TIME :{BLACK}Ūkuia te wā
STR_TIMETABLE_CLEAR_TIME :{BLACK}Ūkuia te Wā
STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Ūkuia te wā mō te mahi kua miramiratia. Pātaki+Pāwhiri kia ūkui i te wā mō ngā mahi katoa
STR_TIMETABLE_CHANGE_SPEED :{BLACK}Panonitia te tepetere
STR_TIMETABLE_CHANGE_SPEED :{BLACK}Panonitia te Tepetere
STR_TIMETABLE_CHANGE_SPEED_TOOLTIP :{BLACK}Panonitia te tere mōrahi me haere ai mō te mahi kua miramiratia. Pātaki+Pāwhiri kia tautuhitia te tere mō ngā mahi katoa
STR_TIMETABLE_CHANGE_SPEED_QUERY :Panonitia te tepetere
STR_TIMETABLE_CLEAR_SPEED :{BLACK}Ūkuia te tepetere
STR_TIMETABLE_CLEAR_SPEED :{BLACK}Ūkuia te Tepetere
STR_TIMETABLE_CLEAR_SPEED_TOOLTIP :{BLACK}Ūkuia te tere mōrahi me haere ai mō te mahi kua miramiratia. Pātaki+Pāwhiri kia ūkui te tere mō ngā mahi katoa
STR_TIMETABLE_RESET_LATENESS :{BLACK}Tautuhitia anō te inenga tōmuri
STR_TIMETABLE_RESET_LATENESS :{BLACK}Tautuhitia Anō te Inenga Tōmuri
STR_TIMETABLE_RESET_LATENESS_TOOLTIP :{BLACK}Tautuhitia anō te inenga tōmuri, kia ū noa iho ai te waka ki te wā hou onāianei. Pātaki+Pāwhiri kia tautuhitia anō te rōpū katoa kia ū ai te waka mātāmua ki te wā, ka tōmua ai te toenga
STR_TIMETABLE_AUTOFILL :{BLACK}Tāuru aunoa
STR_TIMETABLE_AUTOFILL :{BLACK}Tāuru Aunoa
STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Tāuru aunoatia ngā uara o te haerenga e whai ake nei. Pātaki+Pāwhiri kia tarai kia toitū ngā wā taritari
STR_TIMETABLE_EXPECTED :{BLACK}Matapae
@@ -4893,8 +4891,8 @@ STR_AI_CONFIG_GAMESCRIPT :{SILVER}Hōtuhi
STR_AI_CONFIG_GAMESCRIPT_PARAM :{SILVER}Tawhā
STR_AI_CONFIG_AI :{SILVER}Kaitākaro Hangahanga
STR_AI_CONFIG_CHANGE_AI :{BLACK}Tīpakona he kaitākaro hangahanga
STR_AI_CONFIG_CHANGE_GAMESCRIPT :{BLACK}Tīpakona he hōtuhi kēmu
STR_AI_CONFIG_CHANGE_AI :{BLACK}Tīpakona he Kaitākaro Hangahanga
STR_AI_CONFIG_CHANGE_GAMESCRIPT :{BLACK}Tīpakona he Hōtuhi Kēmu
STR_AI_CONFIG_CHANGE_TOOLTIP :{BLACK}Utaina tētahi atu hōtuhi. Pātaki+Pāwhiri kia whakaari i ngā whakaputanga katoa e wātea ana
STR_AI_CONFIG_CONFIGURE :{BLACK}Whirihora
STR_AI_CONFIG_CONFIGURE_TOOLTIP :{BLACK}Whirihorahia ngā tawhā o te Hōtuhi
@@ -5262,11 +5260,6 @@ STR_ERROR_START_AND_END_MUST_BE_IN :{WHITE}Me tōti
STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH :{WHITE}... me tū ki te whenua ngā pito e rua o te arawhiti
STR_ERROR_BRIDGE_TOO_LONG :{WHITE}... he roa rawa te arawhiti
STR_ERROR_BRIDGE_THROUGH_MAP_BORDER :{WHITE}Ka mutu te arawhiti i waho i te mahere
STR_ERROR_BRIDGE_TOO_LOW_FOR_STATION :{WHITE}He hakahaka rawa te arawhiti mō te teihana
STR_ERROR_BRIDGE_TOO_LOW_FOR_ROADSTOP :{WHITE}He hakahaka rawa te arawhiti mō te tūnga rori
STR_ERROR_BRIDGE_TOO_LOW_FOR_BUOY :{WHITE}He hakahaka rawa te arawhiti mō te kārewa
STR_ERROR_BRIDGE_TOO_LOW_FOR_RAIL_WAYPOINT :{WHITE}He hakahaka rawa te arawhiti mō te aratohu rerewhenua
STR_ERROR_BRIDGE_TOO_LOW_FOR_ROAD_WAYPOINT :{WHITE}He hakahaka rawa te arawhiti mō te aratohu rori
# Tunnel related errors
STR_ERROR_CAN_T_BUILD_TUNNEL_HERE :{WHITE}Tē taea te hanga te anaroa i konei...
@@ -5883,8 +5876,6 @@ STR_SAVEGAME_NAME_SPECTATOR :Kaimātakitaki,
# Viewport strings
STR_VIEWPORT_TOWN_POP :{TOWN} ({COMMA})
STR_VIEWPORT_TOWN_CITY :{TOWN} {CITY_ICON}
STR_VIEWPORT_TOWN_CITY_POP :{TOWN} ({COMMA}) {CITY_ICON}
STR_VIEWPORT_STATION :{STATION} {STATION_FEATURES}
# Simple strings to get specific types of data

View File

@@ -5,7 +5,7 @@
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file yapf_common.hpp Commonly used classes and utilities for YAPF. */
/** @file yapf_common.hpp Commonly used classes for YAPF. */
#ifndef YAPF_COMMON_HPP
#define YAPF_COMMON_HPP
@@ -119,30 +119,6 @@ class CYapfT
{
};
/**
* Calculates the octile distance cost between a starting tile / trackdir and a destination tile.
* @param start_tile Starting tile.
* @param start_td Starting trackdir.
* @param destination_tile Destination tile.
* @return Octile distance cost between starting tile / trackdir and destination tile.
*/
inline int OctileDistanceCost(TileIndex start_tile, Trackdir start_td, TileIndex destination_tile)
{
static constexpr int dg_dir_to_x_offs[] = {-1, 0, 1, 0};
static constexpr int dg_dir_to_y_offs[] = {0, 1, 0, -1};
const DiagDirection exitdir = TrackdirToExitdir(start_td);
const int x1 = 2 * TileX(start_tile) + dg_dir_to_x_offs[static_cast<int>(exitdir)];
const int y1 = 2 * TileY(start_tile) + dg_dir_to_y_offs[static_cast<int>(exitdir)];
const int x2 = 2 * TileX(destination_tile);
const int y2 = 2 * TileY(destination_tile);
const int dx = abs(x1 - x2);
const int dy = abs(y1 - y2);
const int dmin = std::min(dx, dy);
const int dxy = abs(dx - dy);
return dmin * YAPF_TILE_CORNER_LENGTH + (dxy - 1) * (YAPF_TILE_LENGTH / 2);
}
#endif /* YAPF_COMMON_HPP */

View File

@@ -194,12 +194,25 @@ public:
*/
inline bool PfCalcEstimate(Node &n)
{
static const int dg_dir_to_x_offs[] = {-1, 0, 1, 0};
static const int dg_dir_to_y_offs[] = {0, 1, 0, -1};
if (this->PfDetectDestination(n)) {
n.estimate = n.cost;
return true;
}
n.estimate = n.cost + OctileDistanceCost(n.GetLastTile(), n.GetLastTrackdir(), this->dest_tile);
TileIndex tile = n.GetLastTile();
DiagDirection exitdir = TrackdirToExitdir(n.GetLastTrackdir());
int x1 = 2 * TileX(tile) + dg_dir_to_x_offs[(int)exitdir];
int y1 = 2 * TileY(tile) + dg_dir_to_y_offs[(int)exitdir];
int x2 = 2 * TileX(this->dest_tile);
int y2 = 2 * TileY(this->dest_tile);
int dx = abs(x1 - x2);
int dy = abs(y1 - y2);
int dmin = std::min(dx, dy);
int dxy = abs(dx - dy);
int d = dmin * YAPF_TILE_CORNER_LENGTH + (dxy - 1) * (YAPF_TILE_LENGTH / 2);
n.estimate = n.cost + d;
assert(n.estimate >= n.parent->estimate);
return true;
}

View File

@@ -293,12 +293,25 @@ public:
*/
inline bool PfCalcEstimate(Node &n)
{
static const int dg_dir_to_x_offs[] = {-1, 0, 1, 0};
static const int dg_dir_to_y_offs[] = {0, 1, 0, -1};
if (this->PfDetectDestination(n)) {
n.estimate = n.cost;
return true;
}
n.estimate = n.cost + OctileDistanceCost(n.segment_last_tile, n.segment_last_td, this->dest_tile);
TileIndex tile = n.segment_last_tile;
DiagDirection exitdir = TrackdirToExitdir(n.segment_last_td);
int x1 = 2 * TileX(tile) + dg_dir_to_x_offs[(int)exitdir];
int y1 = 2 * TileY(tile) + dg_dir_to_y_offs[(int)exitdir];
int x2 = 2 * TileX(this->dest_tile);
int y2 = 2 * TileY(this->dest_tile);
int dx = abs(x1 - x2);
int dy = abs(y1 - y2);
int dmin = std::min(dx, dy);
int dxy = abs(dx - dy);
int d = dmin * YAPF_TILE_CORNER_LENGTH + (dxy - 1) * (YAPF_TILE_LENGTH / 2);
n.estimate = n.cost + d;
assert(n.estimate >= n.parent->estimate);
return true;
}

View File

@@ -96,12 +96,25 @@ public:
{
const TileIndex destination_tile = this->has_intermediate_dest ? this->intermediate_dest_tile : this->dest_tile;
static const int dg_dir_to_x_offs[] = { -1, 0, 1, 0 };
static const int dg_dir_to_y_offs[] = { 0, 1, 0, -1 };
if (this->PfDetectDestination(n)) {
n.estimate = n.cost;
return true;
}
n.estimate = n.cost + OctileDistanceCost(n.segment_last_tile, n.segment_last_td, destination_tile);
TileIndex tile = n.segment_last_tile;
DiagDirection exitdir = TrackdirToExitdir(n.segment_last_td);
int x1 = 2 * TileX(tile) + dg_dir_to_x_offs[(int)exitdir];
int y1 = 2 * TileY(tile) + dg_dir_to_y_offs[(int)exitdir];
int x2 = 2 * TileX(destination_tile);
int y2 = 2 * TileY(destination_tile);
int dx = abs(x1 - x2);
int dy = abs(y1 - y2);
int dmin = std::min(dx, dy);
int dxy = abs(dx - dy);
int d = dmin * YAPF_TILE_CORNER_LENGTH + (dxy - 1) * (YAPF_TILE_LENGTH / 2);
n.estimate = n.cost + d;
assert(n.estimate >= n.parent->estimate);
return true;
}