(svn r27011) -Update from WebTranslator v3.0:

catalan - 1 changes by juanjo
croatian - 15 changes by VoyagerOne
dutch - 28 changes by habell
latin - 5 changes by Supercheese
latvian - 50 changes by Olby
gaelic - 34 changes by GunChleoc
spanish - 2 changes by SilverSurferZzZ

7 files changed, 256 insertions, 157 deletions

diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index 5642a3501..dc8221044 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -683,7 +683,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Clica a
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Clica a la pista de música per treure-la del programa actual (només Personalitzat 1 o Personalitzat 2)
 
 # Highscore window
-STR_HIGHSCORE_TOP_COMPANIES_WHO_REACHED                         :{BIG_FONT}{BLACK}Principals empreses en aconseguir el Nivell {NUM}
+STR_HIGHSCORE_TOP_COMPANIES_WHO_REACHED                         :{BIG_FONT}{BLACK}Principals empreses en arribar al {NUM}
 STR_HIGHSCORE_TOP_COMPANIES_NETWORK_GAME                        :{BIG_FONT}{BLACK}Taula de Lliga d'Empreses a {NUM}
 STR_HIGHSCORE_POSITION                                          :{BIG_FONT}{BLACK}{COMMA}.
 STR_HIGHSCORE_PERFORMANCE_TITLE_BUSINESSMAN                     :Empresari
diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt
index 34280495b..4a64756a8 100644
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -468,6 +468,7 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Izlaz
 
 ############ range for settings menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Postavke igre
+STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Postavke
 STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :Postavke UI-ja/Skripte igre
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Postavke za NewGRF
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Postavke prozirnosti
@@ -1079,6 +1080,13 @@ STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Razluči
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Izaberi razlučivost ekrana
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :ostalo
 
+STR_GAME_OPTIONS_GUI_ZOOM_FRAME                                 :{BLACK}Veličina sučelja
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_TOOLTIP                      :{BLACK}Odaberite koju ćete veličinu elementa sučelja koristiti
+
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normalno
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dvostruka veličina
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Četvorostruka veličina
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Osnovni set grafike
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Odaberi osnovni grafički set za igru
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} datotek{P a e a} nedostaj{P e u e}/korumpiran{P a e o}
@@ -1179,7 +1187,8 @@ STR_CITY_APPROVAL_HOSTILE                                       :Agresivan
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Odgovarajuća UI nije dostupna...{}Možete preuzeti nekoliko UI pomoću sustava 'Online sadržaja'
 
-# Advanced settings window
+# Settings tree window
+STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Postavke
 STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtriraj slijed:
 STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Otvori sve
 STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Zatvori sve
@@ -1195,9 +1204,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Postavke kompan
 STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategorija:
 STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tip:
 STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Sužava doljnju listu koristeći samo predpostavljene filtere
-STR_CONFIG_SETTING_RESTRICT_BASIC                               :Osnovne postavke
-STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Napredne postavke
-STR_CONFIG_SETTING_RESTRICT_ALL                                 :Postavke za napredne korisnike / sve postavke
+STR_CONFIG_SETTING_RESTRICT_BASIC                               :Osnovno (prikaži samo važne postavke)
+STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Napredno (prikaži većinu postavki)
+STR_CONFIG_SETTING_RESTRICT_ALL                                 :Stručno (prikaži sve postavke, uključujući i one neobične)
 STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT             :Postavke sa drugačijim vrijednostima od osnovnih
 STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW                 :Postavke sa drugačijim vrijednostima od postavki vaše nove igre
 
@@ -1706,7 +1715,7 @@ STR_CONFIG_SETTING_DISTRIBUTION_PAX_HELPTEXT                    :"Simetrično" z
 STR_CONFIG_SETTING_DISTRIBUTION_MAIL                            :Način distribucije poštu: {STRING}
 STR_CONFIG_SETTING_DISTRIBUTION_MAIL_HELPTEXT                   :"Simetrično" znači da će se otprilike ista količina pošte slati od stanice A prema stanici B ako od B prema A. "Asimetrično" znači da će se proizvoljne količine pošte slati u oba smjera. "Ručno" znači da se distribucija neće vršiti automatski.
 STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED                        :Način distribucije za OKLOPLJENU klasu tereta: {STRING}
-STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED_HELPTEXT               :OKLOPLJENA klasa tereta sadrži vrijednosnice u umjerenoj klimi, dijamante u subtropskoj klimi ili zlato u subarktičkoj klimi. NewGFR-ovi bi mogli ovo izmijeniti. "Simetrično" znači da će se otprilike ista količina tereta slati od stanice A prema stanici B ako od B prema A. "Asimetrično" znači da će se proizvoljne količine tereta slati u oba smjera. "Ručno" znači da se distribucija tih tereta neće vršiti automatski. Preporučljivo je namjestiti ovu postavku na "asimetrično" ili "ručno" kod subarktičke klime jer banke neće slati zlato natrag prema rudnicima zlata. Za umjerenu i subtropsku klimu možete namjestiti i "simetrično" jer će banke slati neke vrijednosnice natrag prema izvorišnoj banci.
+STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED_HELPTEXT               :OKLOPLJENA klasa tereta sadrži vrijednosnice u umjerenoj klimi, dijamante u subtropskoj klimi ili zlato u subarktičkoj klimi. NewGFR-ovi bi mogli ovo izmijeniti. "Simetrično" znači da će se otprilike ista količina tereta slati od stanice A prema stanici B kao od B prema A. "Asimetrično" znači da će se proizvoljne količine tereta slati u oba smjera. "Ručno" znači da se distribucija tih tereta neće vršiti automatski. Preporučljivo je namjestiti ovu postavku na "asimetrično" ili "ručno" kod subarktičke klime jer banke neće slati zlato natrag prema rudnicima zlata. Za umjerenu i subtropsku klimu možete namjestiti i "simetrično" jer će banke slati neke vrijednosnice natrag prema izvorišnoj banci.
 STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT                         :Način distribucije za ostale klase tereta: {STRING}
 STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT_HELPTEXT                :"Asimetrično" znači da će se proizvoljna količina tereta slati u bilo kojem smjeru. "Ručno" znači da neće biti nikakve automatske distribucije za te terete.
 STR_CONFIG_SETTING_LINKGRAPH_ACCURACY                           :Točnost distribucije: {STRING}
@@ -1825,6 +1834,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Više ig
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Postavke igre
 STR_INTRO_HIGHSCORE                                             :{BLACK}Tablica najboljih rezultata
+STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Postavke
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF Postavke
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Provjeri online sadržaj
 STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}Postavke UI-ja/Skripte igre
@@ -1844,6 +1854,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Odaberi
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Prikaži postavke igre
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Prikaži tablicu najboljih rezultata
+STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Prikaži postavke
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Prikaži postavke NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Provjeri novi i nadograđeni sadržaj za preuzimanje
 STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Prikaži postavke UI-ja/Skripte igre
@@ -3572,7 +3583,7 @@ STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Kloniraj
 STR_DEPOT_CLONE_SHIP                                            :{BLACK}Kloniraj brod
 STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Kloniraj zrakoplov
 
-STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Ovo će kupiti kopiju vlaka uključujući sve vagone. Kliknite na ovaj gumb i onda na vlak unutar ili izvan spremišta. Ctrl+Klik će dijeliti naredbe. Shift+Klik prikazuje trošak bez kupnje.
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Ovo će kupiti kopiju vlaka uključujući sve vagone. Kliknite na ovaj gumb i onda na vlak unutar ili izvan spremišta. Ctrl+Klik će dijeliti naredbe. Shift+Klik prikazuje procijenjeni trošak bez kupnje.
 STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Ovo će kupiti kopiju cestovnog vozila. Klikni na ovaj gumb i onda na cestovno vozilo unutar ili izvan spremišta. CTRL+Klik će dijeliti naredbe. Shift+Klik prikazuje procijenjeni trošak bez kupnje.
 STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Ovo će kupiti kopiju broda. Klikni na ovaj gumb i onda na brod unutar ili izvan spremišta. Ctrl+Klik će dijeliti naredbe. Shift+Klik prikazuje trošak bez kupnje.
 STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Ovo će kupiti kopiju zrakoplova. Klikni ovaj gumb i onda na zrakoplov unutar ili izvan hangara. Control+Klik će dijeliti naredbe. Shift+Klik prikazuje trošak bez kupnje.
@@ -4254,7 +4265,7 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... preb
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... preblizu drugome gradu
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... previše gradova
 STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... nema više mjesta na karti
-STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Grad neće graditi ceste. Možete uključiti gradnju cesta putem Naprednih postavki -> Okolina -> Gradovi
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Grad neće graditi ceste. Možete uključiti gradnju cesta putem Postavki->Okolina->Gradovi
 STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Cestovni radovi u tijeku
 STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Nije moguće izbrisati ovaj grad...{}Postaja ili spremište se pozivaju na grad ili polja u vlasništvu grada nije moguće ukloniti
 STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... nema odgovarajućeg mjesta za kip u središtu ovog grada
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index 791d3786f..879ffc48a 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -372,6 +372,7 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Afsluiten
 
 ############ range for settings menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spelopties
+STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Instellingen
 STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :AI/Game script instellingen
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF instellingen
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Doorzichtigheidsopties
@@ -983,6 +984,13 @@ STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Schermre
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Selecteer de schermresolutie
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Anders
 
+STR_GAME_OPTIONS_GUI_ZOOM_FRAME                                 :{BLACK}Menupuntgrootte
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_TOOLTIP                      :{BLACK}Kies de menupuntgrootte dat moet worden gebruikt
+
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normaal
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dubbele grootte
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :4x Grootte
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Basisset voor graphics
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Kies de te gebruiken basisset voor graphics
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} ontbrekend{P "" e}/corrupt{P "" e} bestand{P "" en}
@@ -1083,7 +1091,8 @@ STR_CITY_APPROVAL_HOSTILE                                       :Vijandig
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Geen bruikbare AIs beschikbaar...{}U kunt diverse AI's downloaden via het 'Online Content' systeem
 
-# Advanced settings window
+# Settings tree window
+STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Instellingen
 STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtertekst:
 STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Alles uitvouwen
 STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Alles inklappen
@@ -1099,9 +1108,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Bedrijfsinstell
 STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Categorie:
 STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Type:
 STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Beperkt de onderstaande lijst met vooraf gedefinieerde filters
-STR_CONFIG_SETTING_RESTRICT_BASIC                               :Gewone instellingen
-STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Geavanceerde instellingen
-STR_CONFIG_SETTING_RESTRICT_ALL                                 :Geavanceerde instellingen / Alle instellingen
+STR_CONFIG_SETTING_RESTRICT_BASIC                               :Basis (toon alleen belangrijke instellingen)
+STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Geavanceerd (toon de meeste instellingen)
+STR_CONFIG_SETTING_RESTRICT_ALL                                 :Expert (toon alle instellingen, inclusief vreemde)
 STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT             :Instellingen met een andere waarde dan de standaard
 STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW                 :Instellingen met een andere waarde dan je 'nieuw spel' instellingen
 
@@ -1156,6 +1165,9 @@ STR_CONFIG_SETTING_DISASTERS_HELPTEXT                           :Schakel rampen
 STR_CONFIG_SETTING_CITY_APPROVAL                                :Gemeenteraad's houding ten opzichte van herstructurering gebied: {STRING}
 STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT                       :Kies hoeveel lawaai en schade aan het milieu door bedrijven de stadswaardering en hun acties beïnvloeden in hun bouwgebied
 
+STR_CONFIG_SETTING_MAX_HEIGHTLEVEL                              :Maximum kaarthoogte: {STRING}
+STR_CONFIG_SETTING_MAX_HEIGHTLEVEL_HELPTEXT                     :Stel de maximum toegestande hoogte voor bergen op de kaart in
+STR_CONFIG_SETTING_TOO_HIGH_MOUNTAIN                            :{WHITE}Je kunt de maximum kaarthoogte niet in deze waarde wijzigen. Minstens één berg op de kaart is hoger
 STR_CONFIG_SETTING_AUTOSLOPE                                    :Omgeving aanpassen onder gebouwen, spoorwegen, enz. toestaan: {STRING}
 STR_CONFIG_SETTING_AUTOSLOPE_HELPTEXT                           :Laat het aanpassen van funderingne onder gebouwen en spoor toe zonder deze te verwijderen
 STR_CONFIG_SETTING_CATCHMENT                                    :Gebruik meer realistische handelsgebieden: {STRING}
@@ -1184,6 +1196,8 @@ STR_CONFIG_SETTING_INFLATION                                    :Inflatie: {STRI
 STR_CONFIG_SETTING_INFLATION_HELPTEXT                           :Schakel de inflatie in de economie in, waar de kosten iets sneller stijgen dan de betalingen
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH                            :Maximum brug lengte: {STRING}
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH_HELPTEXT                   :Maximum lengte voor te bouwen bruggen
+STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT                            :Maximum brughoogte: {STRING}
+STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT_HELPTEXT                   :Maximum hoogte ombruggen te bouwen
 STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH                            :Maximum tunnel lengte: {STRING}
 STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH_HELPTEXT                   :Maximum lengte voor te bouwen tunnels
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD             :Handmatige bouwmethode voor primaire industrieën: {STRING}
@@ -1269,7 +1283,7 @@ STR_CONFIG_SETTING_ERRMSG_DURATION                              :Duur van foutbe
 STR_CONFIG_SETTING_ERRMSG_DURATION_HELPTEXT                     :Duur voor het weergeven van foutmeldingen in een rood venster. Merk op dat sommige (kritische) foutmeldingen niet automatisch wordt gesloten na deze tijd, deze moeten handmatig worden gesloten
 STR_CONFIG_SETTING_ERRMSG_DURATION_VALUE                        :{COMMA} seconde{P 0 "" n}
 STR_CONFIG_SETTING_HOVER_DELAY                                  :Toon tooltips: {STRING}
-STR_CONFIG_SETTING_HOVER_DELAY_HELPTEXT                         :Vertraging voordat tooltips worden weergegeven wanneer de muis over een interface-element. Als alternatief kunnen tooltips worden gebonden aan de rechter muisknop
+STR_CONFIG_SETTING_HOVER_DELAY_HELPTEXT                         :Vertraging voordat tooltips worden weergegeven wanneer de muis over een interface-element. Als alternatief kunnen tooltips worden gebonden aan de rechter muisknop wanneer de waarde 0 is.
 STR_CONFIG_SETTING_HOVER_DELAY_VALUE                            :Wijs aan voor {COMMA} seconde{P 0 "" n}
 STR_CONFIG_SETTING_HOVER_DELAY_DISABLED                         :Rechtsklik
 STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :Geef het inwoneraantal bij een stad weer: {STRING}
@@ -1724,6 +1738,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Multipla
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Spelopties
 STR_INTRO_HIGHSCORE                                             :{BLACK}Score tabel
+STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Instellingen
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF-instellingen
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Online inhoud zoeken
 STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}AI/Spel script Instellingen
@@ -1743,6 +1758,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Kies spe
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Toon spelopties
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Toon score tabel
+STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Scherminstellingen
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Toon NewGRF-instellingen
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Zoeken naar nieuwe en aangepaste inhoud om te downloaden
 STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Toon AI/Game script instellingen
@@ -1782,6 +1798,8 @@ STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Spelen
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magische bulldozer (industrieën en andere onverplaatsbare objecten verwijderen): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnels mogen elkaar kruisen: {ORANGE}{STRING}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Straalvliegtuigen storten niet (vaak) neer op kleine vliegvelden: {ORANGE} {STRING}
+STR_CHEAT_EDIT_MAX_HL                                           :{LTBLUE}Wijzig de maximum kaarthoogte: {ORANGE}{NUM}
+STR_CHEAT_EDIT_MAX_HL_QUERY_CAPT                                :{WHITE}Wijzig de maximum hoogte van bergen op de kaart
 STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Gematigd landschap
 STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Subarctisch landschap
 STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Subtropisch landschap
@@ -2300,7 +2318,7 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Bouw spo
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Bouw treindepot (om treinen te kopen en te onderhouden). Shift schakelt tussen bouwen/inschatting van de kosten
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Bouw spoor om naar controlepost. Houd Ctrl ingedrukt om samen te voegen met andere controlepost. Shift schakelt tussen bouwen/inschatting van de kosten
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Bouw treinstation. Houd Ctrl ingedrukt om samen te voegen met ander station. Shift schakelt tussen bouwen/inschatting van de kosten
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Plaats seinen. Ctrl wisselt tussen armseinen en lichtseinen{}Slepen plaatst seinen langs een recht stuk spoor. Ctrl bouwt seinen tot de volgende wissel{}Ctrl+klik schakelt het openen van het keuzescherm voor seinen aan/uit. Shift schakelt tussen bouwen/inschatting van de kosten
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Plaats seinen. Ctrl wisselt tussen armseinen/lichtseinen{}Slepen plaatst seinen langs een recht stuk spoor. Ctrl bouwt seinen tot de volgende wissel{}Ctrl+klik schakelt het openen van het keuzescherm voor seinen aan/uit. Shift schakelt tussen bouwen/inschatting van de kosten
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Bouw spoorbrug. Shift schakelt tussen bouwen/inschatting van de kosten
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Graaf spoortunnel. Shift schakelt tussen bouwen/inschatting van de kosten
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Kies tussen bouwen en verwijderen van sporen, seinen, controleposten en stations. Houd Ctrl ingedrukt om ook het spoor van controleposten en stations te verwijderen
@@ -2707,6 +2725,9 @@ STR_MAPGEN_BY                                                   :{BLACK}*
 STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Aantal steden:
 STR_MAPGEN_DATE                                                 :{BLACK}Datum:
 STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Aantal industrieën:
+STR_MAPGEN_MAX_HEIGHTLEVEL                                      :{BLACK}Maximum kaarthoogte
+STR_MAPGEN_MAX_HEIGHTLEVEL_UP                                   :{BLACK}Verhoog de maximum hoogte van bergen op de kaart met één
+STR_MAPGEN_MAX_HEIGHTLEVEL_DOWN                                 :{BLACK}Verklein de maximum hoogte van bergen op de kaart met één
 STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Hoogte van sneeuwgrens:
 STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Verschuif de sneeuwgrens één omhoog
 STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Verschuif de sneeuwgrens één omlaag
@@ -2736,6 +2757,7 @@ STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Naam van
 STR_MAPGEN_HEIGHTMAP_SIZE_LABEL                                 :{BLACK}Grootte:
 STR_MAPGEN_HEIGHTMAP_SIZE                                       :{ORANGE}{NUM} x {NUM}
 
+STR_MAPGEN_MAX_HEIGHTLEVEL_QUERY_CAPT                           :{WHITE}Wijzig maximum kaarthoogte
 STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Verander hoogte van sneeuwgrens
 STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Verander beginjaar
 
@@ -4120,6 +4142,7 @@ STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Graafwer
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}... al op zeeniveau
 STR_ERROR_TOO_HIGH                                              :{WHITE}... te hoog
 STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... al vlak
+STR_ERROR_BRIDGE_TOO_HIGH_AFTER_LOWER_LAND                      :{WHITE}Hierna zou de brug hierboven te hoog zijn.
 
 # Company related errors
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Kan bedrijfsnaam niet veranderen...
@@ -4146,7 +4169,7 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... te d
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... te dicht bij een andere plaats
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... te veel plaatsen
 STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... er is geen ruimte meer op de kaart
-STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}De plaats bouwt geen wegen. Het bouwen van wegen kan aangezet worden via Geavanceerde Instellingen->Economie->Plaatsen
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}De plaats bouwt geen wegen. Het bouwen van wegen kan aangezet worden via Geavanceerde Instellingen->Omgeving->Plaatsen
 STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Wegwerkzaamheden in uitvoering
 STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Kan deze plaats niet verwijderen...{}Een station of depot verwijst naar deze plaats of een door de plaats beheerde tegel kan niet worden verwijderd
 STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... er is geen geschikte plaats voor een standbeeld in het centrum van dit dorp
@@ -4309,6 +4332,7 @@ STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Brug moe
 STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Kan niet beginnen en eindigen op dezelfde plaats
 STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Begin van bruggen niet op hetzelfde niveau
 STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Brug is te laag voor dit terrein
+STR_ERROR_BRIDGE_TOO_HIGH_FOR_TERRAIN                           :{WHITE}Brug is te hoogte voor dit terrein.
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Begin en einde moeten op een lijn staan
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... uiteinden van brug moeten beiden op land zijn
 STR_ERROR_BRIDGE_TOO_LONG                                       :{WHITE}... brug te lang
diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt
index ed85582f0..aca4dfb9f 100644
--- a/src/lang/gaelic.txt
+++ b/src/lang/gaelic.txt
@@ -560,6 +560,7 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Fàg an-seo
 
 ############ range for settings menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Roghainnean a' gheama
+STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Roghainnean
 STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :Roghainnean IF/sgriobt geama
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Roghainnean NewGRF
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Roghainnean trìd-shoilleireachd
@@ -1185,6 +1186,13 @@ STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Dùmhlac
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Tagh dùmhlachd-bhreacaidh na sgrìn a chleachdas tu
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Gnàthaichte
 
+STR_GAME_OPTIONS_GUI_ZOOM_FRAME                                 :{BLACK}Meud na h-eadar-aghaidh
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_TOOLTIP                      :{BLACK}Tagh am meud airson rud san eadar-aghaidh
+
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Àbhaisteach
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dà uiread a mheud
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Ceithir uiread a mheud
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Seata grafaigeachd bunasach
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Tagh an seata grafaigeachd bunasach a chleachdas tu
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} {P fhaidhle fhaidhle faidhlichean faidhle} a dhìth/coirbte
@@ -1285,7 +1293,8 @@ STR_CITY_APPROVAL_HOSTILE                                       :Nàimhdeil
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Chan eil IF freagarrach ri fhaighinn...{}’S urrainn dhut roghainn dhe IFan a luchdadh a-nuas leis an t-siostam “Susbaint air loidhne"
 
-# Advanced settings window
+# Settings tree window
+STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Roghainnean
 STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Sreang criathraige:
 STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Leudaich a h-uile
 STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Co-theannaich a h-uile
@@ -1301,9 +1310,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Roghainnean na
 STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Roinn-seòrsa:
 STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Seòrsa:
 STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Cuingichidh seo an liosta gu h-ìosal le criathradh ro-shocraichte
-STR_CONFIG_SETTING_RESTRICT_BASIC                               :Roghainnean bunasach
-STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Roghainnean adhartach
-STR_CONFIG_SETTING_RESTRICT_ALL                                 :Roghainnean an eòlaiche / na h-uile roghainn
+STR_CONFIG_SETTING_RESTRICT_BASIC                               :Bunasach (na seall ach roghainnean cudromach)
+STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Adhartach (a’ mhòrchuid dhe na roghainnean)
+STR_CONFIG_SETTING_RESTRICT_ALL                                 :Eòlaiche (a h-uile roghainn, a’ gabhail a-steach an fheadhainn neònach)
 STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT             :Roghainnean le luach diofraichte bhon luach bhunaiteach
 STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW                 :Roghainnean le luach diofraichte bho luach nan geamannan ùra agad
 
@@ -1358,6 +1367,9 @@ STR_CONFIG_SETTING_DISASTERS_HELPTEXT                           :Toglaich dunaid
 STR_CONFIG_SETTING_CITY_APPROVAL                                :Beachdan comhairle a' bhaile air leasachadh raointean: {STRING}
 STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT                       :Tagh am meud dhe dh'fhuaim is milleadh na h-àrainneachd le companaidhean a tha a dhìth mus bi buaidh air luachadh a' bhaile is barrachd togail san sgìre
 
+STR_CONFIG_SETTING_MAX_HEIGHTLEVEL                              :Àirde as motha a’ mhapa: {STRING}
+STR_CONFIG_SETTING_MAX_HEIGHTLEVEL_HELPTEXT                     :Suidhich an àirde as motha aig beanntan a bhios ceadaichte air a’ mhapa
+STR_CONFIG_SETTING_TOO_HIGH_MOUNTAIN                            :{WHITE}Chan urrainn dhut àirde as motha a’ mhapa a shuidheachadh air an luach seo. Tha beinn air a’ mhapa a tha nas àirde.
 STR_CONFIG_SETTING_AUTOSLOPE                                    :Ceadaich atharrachadh crutha-tìre fo thogalaichean, slighean agus msaa.: {STRING}
 STR_CONFIG_SETTING_AUTOSLOPE_HELPTEXT                           :Ceadaich atharrachadh crutha-tìre fo thogalaichean is slighean gun a bhith gan toirt air falbh
 STR_CONFIG_SETTING_CATCHMENT                                    :Ceadaich raointean tionail le meud a tha nas fhìor-riochdail: {STRING}
@@ -1386,6 +1398,8 @@ STR_CONFIG_SETTING_INFLATION                                    :Atmhorachd: {ST
 STR_CONFIG_SETTING_INFLATION_HELPTEXT                           :Cuir atmhorachd an comas san eaconamaidh is bidh cosgaisean a' dìreadh beagan nas luaithe na pàighidhean
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH                            :Faide as motha nan drochaidean: {STRING}
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH_HELPTEXT                   :Chan urrainn dhut drochaidean a thogail a tha nas fhaide na seo
+STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT                            :Àirde as motha dhrochaidean: {STRING}
+STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT_HELPTEXT                   :An àirde as motha gus drochaidean a thogail
 STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH                            :Faide as motha nan tunailean: {STRING}
 STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH_HELPTEXT                   :Chan urrainn dhut tunail a thogail a tha nas fhaide na seo
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD             :Modh togail a làimh aig prìomh ghnìomhachasan: {STRING}
@@ -1807,7 +1821,7 @@ STR_CONFIG_SETTING_DISTRIBUTION_PAX_HELPTEXT                    :Is ciall dha �
 STR_CONFIG_SETTING_DISTRIBUTION_MAIL                            :Am modh sgaoilidh airson post: {STRING}
 STR_CONFIG_SETTING_DISTRIBUTION_MAIL_HELPTEXT                   :Is ciall dha “co-chothromach” gun tèid cha mhòr an aon uiread dhe phost a chur o stèisean A gu stèisean B ’s a thèid a chur o stèisean B gu stèisean A. Is ciall dha “neo-chothromach” gun tèid uiread air thuaiream dhe phost a chur dhan dà chomhair. Is ciall dha “a làimh” nach tèid sgaoileadh fèin-obrachail sam bith a dhèanamh airson post.
 STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED                        :Am modh sgaoilidh airson an t-seòrsa carago ARMAILTE: {STRING}
-STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED_HELPTEXT               :Tha an seòrsa carago ARMAILTE a’ gabhail a-steach seilbh fo gnàth-shìde mheasarra, daoimeanan fo gnàth-shìde fho-thropaigeach is òr fo gnàth-shìde fho-artach. Dh’fhaoidte gun atharraich NewGRF seo. Is ciall dha “co-chothromach” gun tèid cha mhòr an aon uiread dhe charago a chur o stèisean A gu stèisean B ’s a thèid a chur o stèisean B gu stèisean A. Is ciall dha “neo-chothromach” gun tèid uiread air thuaiream a chur dhan dà chomhair. Is ciall dha “a làimh” nach tèid sgaoileadh fèin-obrachail sam bith a dhèanamh airson a’ charago ud. Cha chreid sinn nach eil thu airson seo a shuidheachadh air “neo-chothromach” no “a làimh” nuair a bhios tu a’ cluich le cruth-tìre fo-artach on nach cuir bancaichean òr air ais gu mèinnean òir. Le cruth-tìre measarra no fo-thropaigeach, ’s urrainn dhut “co-chothromach” a thaghadh cuideachd on a chuireas bancaichean seilbh air ais dhan bhanca eile.
+STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED_HELPTEXT               :Tha an seòrsa carago ARMAILTE a’ gabhail a-steach seilbh fo chruth-tìre measarra, daoimeanan fo chruth-tìre fo-thropaigeach is òr fo chruth-tìre fo-artach. Dh’fhaoidte gun atharraich NewGRF seo. Is ciall dha “co-chothromach” gun tèid timcheall an aon uireid dhe charago a chur o stèisean A gu stèisean B ’s a thèid a chur o stèisean B gu stèisean A. Is ciall dha “neo-chothromach” gun tèid uiread air thuaiream a chur dhan dà chomhair. Is ciall dha “a làimh” nach tèid sgaoileadh fèin-obrachail sam bith a dhèanamh airson a’ charago ud. Mholamaid gun suidhich thu seo air “neo-chothromach” no “a làimh” nuair a bhios tu a’ cluich le cruth-tìre fo-artach on nach cuir bancaicean òr air ais gu mèinnean òir. Le cruth-tìre measarra no fo-thropaigeach, ’s urrainn dhut “co-chothromach” a thaghadh cuideachd on a chuireas bancaichean seilbh air ais dhan bhanca eile.
 STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT                         :Am modh sgaoilidh airson seòrsaichean eile dhe charago: {STRING}
 STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT_HELPTEXT                :Is ciall dha “neo-chothromach” gun tèid uiread air thuaiream a chur dhan dà chomhair. Is ciall dha “a làimh” nach tèid sgaoileadh fèin-obrachail sam bith a dhèanamh airson a' charago ud.
 STR_CONFIG_SETTING_LINKGRAPH_ACCURACY                           :Pongalachd an sgaoilidh: {STRING}
@@ -1820,37 +1834,37 @@ STR_CONFIG_SETTING_SHORT_PATH_SATURATION                        :Lìonadh nan sl
 STR_CONFIG_SETTING_SHORT_PATH_SATURATION_HELPTEXT               :Gu tric, tha iomadh slighe eadar dà stèisean ann. Lìonaidh an sgaoileadh carago an t-slighe as giorra an toiseach is an dàrna slighe as giorra an uairsin is mar sin air adhart. Thèid a mheasadh a bheil slighe làn gus nach eil le tuairmse air na ghabhas an t-slighe ris is air a' chleachdadh a th' air a' phlana. Nuair a bhios na h-uile slighe air an lìonadh is rum a dhìth fhathast, thèid luchd a bharrachd a chur air gach slighe is an fheadhainn aig a bheil mòran rum a thaghadh an toiseach. Co-dhiù, cha dèan an algairim tuairmse buileach ceart air an rum mar as trice. Leigidh an roghainn seo leat sònrachadh dè an ceudad aig slighe as giorra a thèid a cleachdadh sa chiad dol a-mach mus tèid an ath shlighe as fhaide a thaghadh. Dèan nas lugha na 100% e ach nach bidh na stèiseanan ro làn nuair a thèid rum a mheas ro mhòr.
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY                  :Aonadan luaiths: {STRING}
-STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT         :Nuair a thèid luaths a shealltainn san eadar-aghaidh, seall e sna h-aonadan a thagh thu
+STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT         :Nuair a thèid luaths a shealltainn san eadar-aghaidh, seall e leis na h-aonadan a thagh thu
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL         :Impireil (mph)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_METRIC           :Meatrach (km/h)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_SI               :SI (m/s)
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER                     :Aonadan lùth carabaid: {STRING}
-STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT            :Nuair a thèid lùth carabaid a shealltainn san eadar-aghaidh, seall e sna h-aonadan a thagh thu
+STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT            :Nuair a thèid lùth carabaid a shealltainn san eadar-aghaidh, seall e leis na h-aonadan a thagh thu
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_IMPERIAL            :Impireil (hp)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_METRIC              :Meatrach (hp)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_SI                  :SI (kW)
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT                    :Aonadan cuideim: {STRING}
-STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_HELPTEXT           :Nuair a thèid cuideam a shealltainn san eadar-aghaidh, seall e sna h-aonadan a thagh thu
+STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_HELPTEXT           :Nuair a thèid cuideam a shealltainn san eadar-aghaidh, seall e leis na h-aonadan a thagh thu
 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_IMPERIAL           :Impireil (t ghoirid/tunna)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_METRIC             :Meatrach (t/tunna)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_SI                 :SI (kg)
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME                    :Aonadan tomhais-lìonaidh: {STRING}
-STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_HELPTEXT           :Nuair a thèid tomhas-lìonaidh a shealltainn san eadar-aghaidh, seall e sna h-aonadan a thagh thu
+STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_HELPTEXT           :Nuair a thèid tomhas-lìonaidh a shealltainn san eadar-aghaidh, seall e leis na h-aonadan a thagh thu
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_IMPERIAL           :Impireil (gal)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_METRIC             :Meatrach (l)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_SI                 :SI (m³)
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE                     :Aonadan spàirn tàirnge: {STRING}
-STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_HELPTEXT            :Nuair a thèid spàirn tàirnge a shealltainn san eadar-aghaidh, seall i sna h-aonadan a thagh thu
+STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_HELPTEXT            :Nuair a thèid spàirn tàirnge a shealltainn san eadar-aghaidh, seall i leis na h-aonadan a thagh thu
 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_IMPERIAL            :Impireil (lbf)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_METRIC              :Meatrach (kgf)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_SI                  :SI (kN)
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT                    :Aonadan àirde: {STRING}
-STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_HELPTEXT           :Nuair a thèid àirde a shealltainn san eadar-aghaidh, seall i sna h-aonadan a thagh thu
+STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_HELPTEXT           :Nuair a thèid àirde a shealltainn san eadar-aghaidh, seall i leis na h-aonadan a thagh thu
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Impireil (ft)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Meatrach (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI (m)
@@ -1926,6 +1940,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Ioma-chl
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Roghainnean a' gheama
 STR_INTRO_HIGHSCORE                                             :{BLACK}Clàr nan sgòran àrda
+STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Roghainnean
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Roghainnean NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Susbaint air loidhne
 STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}Roghainnean sgriobt IF/Geama
@@ -1945,6 +1960,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Tagh an
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Seall roghainnean a' gheama
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Seall clàr nan sgòran àrda
+STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Roghainnean an t-seallaidh
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Seall na roghainnean NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Thoir sùil airson susbainte ùire no air a h-ùrachadh ri luchdadh a-nuas
 STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Seall roghainnean sgriobt IF/geama
@@ -1984,6 +2000,8 @@ STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}A' clui
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Bulldozer draoidheach (thoir air falbh gnìomhachasan, oibseactan do-ghluasad): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Faodaidh tunailean dol tarsainn càch a chèile: {ORANGE}{STRING}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Cha tachair tubaist (gu tric) le steall-phlèan air port-adhair beag: {ORANGE}{STRING}
+STR_CHEAT_EDIT_MAX_HL                                           :{LTBLUE}Deasaich àirde as motha a’ mhapa: {ORANGE}{NUM}
+STR_CHEAT_EDIT_MAX_HL_QUERY_CAPT                                :{BLACK}Deasaich an àirde as motha dhe bheanntan air a’ mhapa
 STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Cruth-tìre measarra
 STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Cruth-tìre fo-artach
 STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Cruth-tìre fo-thropaigeach
@@ -2502,7 +2520,7 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Tog rath
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Tog trèan-lann (gus trèanaichean a cheannach no obair-chàraidh a dhèanamh orra). Toglaidh Shift togail/sealladh air tuairmse chosgaisean
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Dèan puing-thurais dhe rèile. Ceanglaidh Ctrl puingean-turais ri chèile. Toglaidh Shift togail/sealladh air tuairmse chosgaisean
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Tog stèisean. Ceanglaidh Ctrl stèiseanan ri chèile. Toglaidh Shift togail/sealladh air tuairmse chosgaisean
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Tog comharran rèile. Toglaidh Ctrl eadar comharran saimeafoir/solais{}Slaod gus comharran a thogail rè slighe rèile dìrich. Togaidh Ctrl comharran gu ruige an ath ghobhail{}Toglaidh Ctrl+briogadh a bheil uinneag taghadh nan comharran fosgailte. Toglaidh Shift togail/sealladh air tuairmse chosgaisean
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Tog comharran rèile. Toglaidh Ctrl eadar comharran saimeafoir/solais{}Slaod gus comharran a thogail rè slighe rèile dìrich. Togaidh Ctrl comharran gu ruige an ath ghobhail no comharra{}Toglaidh Ctrl+briogadh a bheil uinneag taghadh nan comharran fosgailte. Toglaidh Shift togail/sealladh air tuairmse chosgaisean
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Tog drochaid rèile. Toglaidh Shift togail/sealladh air tuairmse chosgaisean
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Tog tunail rèile. Toglaidh Shift togail/sealladh air tuairmse chosgaisean
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Toglaich togail/toirt air falbh airson slighe-rèile, comharran, puingean-turais is stèiseanan. Cùm Ctrl sìos gus rèile nam puingean-turais is stèiseanan a thoirt air falbh cuideachd
@@ -2936,6 +2954,9 @@ STR_MAPGEN_BY                                                   :{BLACK}*
 STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Bailtean:
 STR_MAPGEN_DATE                                                 :{BLACK}Ceann-latha:
 STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Gnìomhachasan:
+STR_MAPGEN_MAX_HEIGHTLEVEL                                      :{BLACK}Àirde as motha a’ mhapa
+STR_MAPGEN_MAX_HEIGHTLEVEL_UP                                   :{BLACK}Meudaich an àirde as motha dhe bheanntan air a’ mhapa le a h-aon
+STR_MAPGEN_MAX_HEIGHTLEVEL_DOWN                                 :{BLACK}Lùghdaich an àirde as motha dhe bheanntan air a’ mhapa le a h-aon
 STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Àirde na loidhne-shneachda:
 STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Gluais an loidhne-shneachda suas aon cheum
 STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Gluais an loidhne-shneachda sìos aon cheum
@@ -2965,6 +2986,7 @@ STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Ainm a'
 STR_MAPGEN_HEIGHTMAP_SIZE_LABEL                                 :{BLACK}Meud:
 STR_MAPGEN_HEIGHTMAP_SIZE                                       :{ORANGE}{NUM} x {NUM}
 
+STR_MAPGEN_MAX_HEIGHTLEVEL_QUERY_CAPT                           :{WHITE}Atharraich an àirde as motha air mapa
 STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Atharraich àirde na loidhne-shneachda
 STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Atharraich am bliadhna-tòiseachaidh
 
@@ -4349,6 +4371,7 @@ STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Bhiodh a
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}... air àirde na mara mu thràth
 STR_ERROR_TOO_HIGH                                              :{WHITE}... ro àrd
 STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... rèidh mu thràth
+STR_ERROR_BRIDGE_TOO_HIGH_AFTER_LOWER_LAND                      :{WHITE}Bhiodh a drochaid os a chionn ro àird an uairsin.
 
 # Company related errors
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Cha ghabh ainm na companaidh atharrachadh...
@@ -4375,7 +4398,7 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... ro f
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... ro fhaisg air baile eile
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... tha cus bhailtean ann
 STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... chan eil rum air fhàgail air a' mhapa
-STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Cha tog am baile rathad sam bith. ’S urrainn dhut togail rathaidean a chur an comas le Roghainnean adhartach->Eaconamaidh->Bailtean
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Cha tog am baile rathad sam bith. ’S urrainn dhut togail rathaidean a chur an comas le Roghainnean->Àrainneachd->Bailtean
 STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Rathad ga ath-thogail
 STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Cha ghabh am baile seo sguabadh às...{}Tha stèisean no port no garaids no trèan-lann no cala no hangar a' toirt iomradh air a' bhaile no tha leac ann a tha leis a' bhaile is nach gabh toirt air falbh
 STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... chan eil ionad freagarrach airson ìomhaigh ann am meadhan a' bhaile seo
@@ -4538,6 +4561,7 @@ STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Feumaidh
 STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Chan urrainn dhut tòiseachadh is crìochnachadh air an aon àite
 STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Chan eil an dà cheann aig an drochaid air an aon àirde
 STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Tha an drochaid ro ìosal airson a' chrutha-tìre seo
+STR_ERROR_BRIDGE_TOO_HIGH_FOR_TERRAIN                           :{WHITE}Tha an drochaid ro àrd airson a’ chrutha-thìre seo.
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Feumaidh an toiseach is a' chrìoch a bhith air an aon loidhne
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... feumaidh an dà cheann aig an drochaid a bhith air tìr
 STR_ERROR_BRIDGE_TOO_LONG                                       :{WHITE}... tha an drochaid ro fhada
diff --git a/src/lang/latin.txt b/src/lang/latin.txt
index 1b67d083d..da352002a 100644
--- a/src/lang/latin.txt
+++ b/src/lang/latin.txt
@@ -12,7 +12,7 @@
 ##case gen acc abl dat
 
 
-# $Id:
+# $Id$
 
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
@@ -28,257 +28,257 @@ STR_JUST_NOTHING                                                :Nihil
 
 # Cargo related strings
 # Plural cargo name
-# Genetives are lowercase due to the context of their {STRING.gen} calls
 STR_CARGO_PLURAL_NOTHING                                        :
 STR_CARGO_PLURAL_PASSENGERS                                     :{G=mp}Vectores
-STR_CARGO_PLURAL_PASSENGERS.acc                                 :{G=mp}Vectores
 STR_CARGO_PLURAL_PASSENGERS.gen                                 :{G=mp}vectorum
+STR_CARGO_PLURAL_PASSENGERS.acc                                 :{G=mp}Vectores
 STR_CARGO_PLURAL_PASSENGERS.dat                                 :{G=mp}Vectoribus
 STR_CARGO_PLURAL_COAL                                           :{G=m}Carbo
-STR_CARGO_PLURAL_COAL.acc                                       :{G=m}Carbonem
 STR_CARGO_PLURAL_COAL.gen                                       :{G=m}carbonis
+STR_CARGO_PLURAL_COAL.acc                                       :{G=m}Carbonem
 STR_CARGO_PLURAL_COAL.dat                                       :{G=m}Carboni
 STR_CARGO_PLURAL_MAIL                                           :{G=fp}Epistulae
-STR_CARGO_PLURAL_MAIL.acc                                       :{G=fp}Epistulas
 STR_CARGO_PLURAL_MAIL.gen                                       :{G=fp}epistularum
+STR_CARGO_PLURAL_MAIL.acc                                       :{G=fp}Epistulas
 STR_CARGO_PLURAL_MAIL.dat                                       :{G=fp}epistulis
 STR_CARGO_PLURAL_OIL                                            :{G=n}Petroleum
-STR_CARGO_PLURAL_OIL.acc                                        :{G=n}Petroleum
 STR_CARGO_PLURAL_OIL.gen                                        :{G=n}petrolei
+STR_CARGO_PLURAL_OIL.acc                                        :{G=n}Petroleum
 STR_CARGO_PLURAL_OIL.dat                                        :{G=n}Petroleo
 STR_CARGO_PLURAL_LIVESTOCK                                      :{G=np}Pecora
-STR_CARGO_PLURAL_LIVESTOCK.acc                                  :{G=np}Pecora
 STR_CARGO_PLURAL_LIVESTOCK.gen                                  :{G=np}pecorum
+STR_CARGO_PLURAL_LIVESTOCK.acc                                  :{G=np}Pecora
 STR_CARGO_PLURAL_LIVESTOCK.dat                                  :{G=np}Pecoribus
 STR_CARGO_PLURAL_GOODS                                          :{G=fp}Merces
-STR_CARGO_PLURAL_GOODS.acc                                      :{G=fp}Merces
 STR_CARGO_PLURAL_GOODS.gen                                      :{G=fp}mercium
+STR_CARGO_PLURAL_GOODS.acc                                      :{G=fp}Merces
 STR_CARGO_PLURAL_GOODS.dat                                      :{G=fp}Mercibus
 STR_CARGO_PLURAL_GRAIN                                          :{G=n}Frumentum
-STR_CARGO_PLURAL_GRAIN.acc                                      :{G=n}Frumentum
 STR_CARGO_PLURAL_GRAIN.gen                                      :{G=n}frumenti
+STR_CARGO_PLURAL_GRAIN.acc                                      :{G=n}Frumentum
 STR_CARGO_PLURAL_GRAIN.dat                                      :{G=n}Frumento
 STR_CARGO_PLURAL_WOOD                                           :{G=n}Lignum
-STR_CARGO_PLURAL_WOOD.acc                                       :{G=n}Lignum
 STR_CARGO_PLURAL_WOOD.gen                                       :{G=n}ligni
+STR_CARGO_PLURAL_WOOD.acc                                       :{G=n}Lignum
 STR_CARGO_PLURAL_WOOD.dat                                       :{G=n}Ligno
 STR_CARGO_PLURAL_IRON_ORE                                       :{G=n}Ferrum
-STR_CARGO_PLURAL_IRON_ORE.acc                                   :{G=n}Ferrum
 STR_CARGO_PLURAL_IRON_ORE.gen                                   :{G=n}ferri
+STR_CARGO_PLURAL_IRON_ORE.acc                                   :{G=n}Ferrum
 STR_CARGO_PLURAL_IRON_ORE.dat                                   :{G=n}Ferro
 STR_CARGO_PLURAL_STEEL                                          :{G=m}Chalybs
-STR_CARGO_PLURAL_STEEL.acc                                      :{G=m}Chalybem
 STR_CARGO_PLURAL_STEEL.gen                                      :{G=m}chalybis
+STR_CARGO_PLURAL_STEEL.acc                                      :{G=m}Chalybem
 STR_CARGO_PLURAL_STEEL.dat                                      :{G=m}Chalybi
 STR_CARGO_PLURAL_VALUABLES                                      :{G=fp}Res Pretiosa
-STR_CARGO_PLURAL_VALUABLES.acc                                  :{G=fp}Res Pretiosas
 STR_CARGO_PLURAL_VALUABLES.gen                                  :{G=fp}rerum pretiosarum
+STR_CARGO_PLURAL_VALUABLES.acc                                  :{G=fp}Res Pretiosas
 STR_CARGO_PLURAL_VALUABLES.dat                                  :{G=fp}Rebus Pretiosis
 STR_CARGO_PLURAL_COPPER_ORE                                     :{G=n}Aes
-STR_CARGO_PLURAL_COPPER_ORE.acc                                 :{G=n}Aes
 STR_CARGO_PLURAL_COPPER_ORE.gen                                 :{G=n}aeris
+STR_CARGO_PLURAL_COPPER_ORE.acc                                 :{G=n}Aes
 STR_CARGO_PLURAL_COPPER_ORE.dat                                 :{G=n}Aeri
 STR_CARGO_PLURAL_MAIZE                                          :{G=n}Maizium
-STR_CARGO_PLURAL_MAIZE.acc                                      :{G=n}Maizium
 STR_CARGO_PLURAL_MAIZE.gen                                      :{G=n}maizii
+STR_CARGO_PLURAL_MAIZE.acc                                      :{G=n}Maizium
 STR_CARGO_PLURAL_MAIZE.dat                                      :{G=n}Maizio
 STR_CARGO_PLURAL_FRUIT                                          :{G=m}Fructus
-STR_CARGO_PLURAL_FRUIT.acc                                      :{G=m}Fructum
 STR_CARGO_PLURAL_FRUIT.gen                                      :{G=m}fructus
+STR_CARGO_PLURAL_FRUIT.acc                                      :{G=m}Fructum
 STR_CARGO_PLURAL_FRUIT.dat                                      :{G=m}Fructui
 STR_CARGO_PLURAL_DIAMONDS                                       :{G=mp}Adamantes
-STR_CARGO_PLURAL_DIAMONDS.acc                                   :{G=mp}Adamantes
 STR_CARGO_PLURAL_DIAMONDS.gen                                   :{G=mp}adamantum
+STR_CARGO_PLURAL_DIAMONDS.acc                                   :{G=mp}Adamantes
 STR_CARGO_PLURAL_DIAMONDS.dat                                   :{G=mp}Adamantibus
 STR_CARGO_PLURAL_FOOD                                           :{G=m}Cibus
-STR_CARGO_PLURAL_FOOD.acc                                       :{G=m}Cibum
 STR_CARGO_PLURAL_FOOD.gen                                       :{G=m}cibi
+STR_CARGO_PLURAL_FOOD.acc                                       :{G=m}Cibum
 STR_CARGO_PLURAL_FOOD.dat                                       :{G=m}Cibo
 STR_CARGO_PLURAL_PAPER                                          :{G=f}Charta
-STR_CARGO_PLURAL_PAPER.acc                                      :{G=f}Chartam
 STR_CARGO_PLURAL_PAPER.gen                                      :{G=f}chartae
+STR_CARGO_PLURAL_PAPER.acc                                      :{G=f}Chartam
 STR_CARGO_PLURAL_PAPER.dat                                      :{G=f}Chartae
 STR_CARGO_PLURAL_GOLD                                           :{G=n}Aurum
-STR_CARGO_PLURAL_GOLD.acc                                       :{G=n}Aurum
 STR_CARGO_PLURAL_GOLD.gen                                       :{G=n}auri
+STR_CARGO_PLURAL_GOLD.acc                                       :{G=n}Aurum
 STR_CARGO_PLURAL_GOLD.dat                                       :{G=n}Auro
 STR_CARGO_PLURAL_WATER                                          :{G=f}Aqua
-STR_CARGO_PLURAL_WATER.acc                                      :{G=f}Aquam
 STR_CARGO_PLURAL_WATER.gen                                      :{G=f}aquae
+STR_CARGO_PLURAL_WATER.acc                                      :{G=f}Aquam
 STR_CARGO_PLURAL_WATER.dat                                      :{G=f}Aquae
 STR_CARGO_PLURAL_WHEAT                                          :{G=n}Triticum
-STR_CARGO_PLURAL_WHEAT.acc                                      :{G=n}Triticum
 STR_CARGO_PLURAL_WHEAT.gen                                      :{G=n}tritici
+STR_CARGO_PLURAL_WHEAT.acc                                      :{G=n}Triticum
 STR_CARGO_PLURAL_WHEAT.dat                                      :{G=n}Tritico
 STR_CARGO_PLURAL_RUBBER                                         :{G=f}Gummis
-STR_CARGO_PLURAL_RUBBER.acc                                     :{G=f}Gummem
 STR_CARGO_PLURAL_RUBBER.gen                                     :{G=f}gummis
+STR_CARGO_PLURAL_RUBBER.acc                                     :{G=f}Gummem
 STR_CARGO_PLURAL_RUBBER.dat                                     :{G=f}Gummi
 STR_CARGO_PLURAL_SUGAR                                          :{G=n}Saccharum
-STR_CARGO_PLURAL_SUGAR.acc                                      :{G=n}Saccharum
 STR_CARGO_PLURAL_SUGAR.gen                                      :{G=n}sacchari
+STR_CARGO_PLURAL_SUGAR.acc                                      :{G=n}Saccharum
 STR_CARGO_PLURAL_SUGAR.dat                                      :{G=n}Saccharo
 STR_CARGO_PLURAL_TOYS                                           :{G=np}Ludicra
-STR_CARGO_PLURAL_TOYS.acc                                       :{G=np}Ludicra
 STR_CARGO_PLURAL_TOYS.gen                                       :{G=np}Ludicrorum
+STR_CARGO_PLURAL_TOYS.acc                                       :{G=np}Ludicra
 STR_CARGO_PLURAL_TOYS.dat                                       :{G=np}Ludicris
 STR_CARGO_PLURAL_CANDY                                          :{G=np}Bellaria
-STR_CARGO_PLURAL_CANDY.acc                                      :{G=np}Bellaria
 STR_CARGO_PLURAL_CANDY.gen                                      :{G=np}bellariorum
+STR_CARGO_PLURAL_CANDY.acc                                      :{G=np}Bellaria
 STR_CARGO_PLURAL_CANDY.dat                                      :{G=np}Bellariis
 STR_CARGO_PLURAL_COLA                                           :{G=f}Cola
-STR_CARGO_PLURAL_COLA.acc                                       :{G=f}Colam
 STR_CARGO_PLURAL_COLA.gen                                       :{G=f}colae
+STR_CARGO_PLURAL_COLA.acc                                       :{G=f}Colam
 STR_CARGO_PLURAL_COLA.dat                                       :{G=f}Colae
 STR_CARGO_PLURAL_COTTON_CANDY                                   :{G=n}Sacchari Xylinum
-STR_CARGO_PLURAL_COTTON_CANDY.acc                               :{G=n}Sacchari Xylinum
 STR_CARGO_PLURAL_COTTON_CANDY.gen                               :{G=n}sacchari xylini
+STR_CARGO_PLURAL_COTTON_CANDY.acc                               :{G=n}Sacchari Xylinum
 STR_CARGO_PLURAL_COTTON_CANDY.dat                               :{G=n}Sacchari Xylino
 STR_CARGO_PLURAL_BUBBLES                                        :{G=fp}Bullae
-STR_CARGO_PLURAL_BUBBLES.acc                                    :{G=fp}Bullas
 STR_CARGO_PLURAL_BUBBLES.gen                                    :{G=fp}bullarum
+STR_CARGO_PLURAL_BUBBLES.acc                                    :{G=fp}Bullas
 STR_CARGO_PLURAL_BUBBLES.dat                                    :{G=fp}Bullis
 STR_CARGO_PLURAL_TOFFEE                                         :{G=n}Saccharum Tostum
-STR_CARGO_PLURAL_TOFFEE.acc                                     :{G=n}Saccharum Tostum
 STR_CARGO_PLURAL_TOFFEE.gen                                     :{G=n}sacchari tosti
+STR_CARGO_PLURAL_TOFFEE.acc                                     :{G=n}Saccharum Tostum
 STR_CARGO_PLURAL_TOFFEE.dat                                     :{G=n}Saccharo Tosto
 STR_CARGO_PLURAL_BATTERIES                                      :{G=fp}Pilae Electricae
-STR_CARGO_PLURAL_BATTERIES.acc                                  :{G=fp}Pilas Electricas
 STR_CARGO_PLURAL_BATTERIES.gen                                  :{G=fp}pilarum electricarum
+STR_CARGO_PLURAL_BATTERIES.acc                                  :{G=fp}Pilas Electricas
 STR_CARGO_PLURAL_BATTERIES.dat                                  :{G=fp}Pilis Electricis
 STR_CARGO_PLURAL_PLASTIC                                        :{G=f}Plastica
-STR_CARGO_PLURAL_PLASTIC.acc                                    :{G=f}Plasticam
 STR_CARGO_PLURAL_PLASTIC.gen                                    :{G=f}plasticae
+STR_CARGO_PLURAL_PLASTIC.acc                                    :{G=f}Plasticam
 STR_CARGO_PLURAL_PLASTIC.dat                                    :{G=f}Plasticae
 STR_CARGO_PLURAL_FIZZY_DRINKS                                   :{G=fp}Potiones Carbonatae
-STR_CARGO_PLURAL_FIZZY_DRINKS.acc                               :{G=fp}Potiones Carbonatas
 STR_CARGO_PLURAL_FIZZY_DRINKS.gen                               :{G=fp}potionum carbonatarum
+STR_CARGO_PLURAL_FIZZY_DRINKS.acc                               :{G=fp}Potiones Carbonatas
 STR_CARGO_PLURAL_FIZZY_DRINKS.dat                               :{G=fp}Potionibus Carbonatis
+
 # Singular cargo name
 STR_CARGO_SINGULAR_NOTHING                                      :
 STR_CARGO_SINGULAR_PASSENGER                                    :{G=mp}Vectores
-STR_CARGO_SINGULAR_PASSENGER.acc                                :{G=mp}Vectores
 STR_CARGO_SINGULAR_PASSENGER.gen                                :{G=mp}vectorum
+STR_CARGO_SINGULAR_PASSENGER.acc                                :{G=mp}Vectores
 STR_CARGO_SINGULAR_PASSENGER.dat                                :{G=mp}Vectoribus
 STR_CARGO_SINGULAR_COAL                                         :{G=m}Carbo
-STR_CARGO_SINGULAR_COAL.acc                                     :{G=m}Carbonem
 STR_CARGO_SINGULAR_COAL.gen                                     :{G=m}carbonis
+STR_CARGO_SINGULAR_COAL.acc                                     :{G=m}Carbonem
 STR_CARGO_SINGULAR_COAL.dat                                     :{G=m}Carboni
 STR_CARGO_SINGULAR_MAIL                                         :{G=fp}Epistulae
-STR_CARGO_SINGULAR_MAIL.acc                                     :{G=fp}Epistulas
 STR_CARGO_SINGULAR_MAIL.gen                                     :{G=fp}epistularum
+STR_CARGO_SINGULAR_MAIL.acc                                     :{G=fp}Epistulas
 STR_CARGO_SINGULAR_MAIL.dat                                     :{G=fp}epistulis
 STR_CARGO_SINGULAR_OIL                                          :{G=n}Petroleum
-STR_CARGO_SINGULAR_OIL.acc                                      :{G=n}Petroleum
 STR_CARGO_SINGULAR_OIL.gen                                      :{G=n}petrolei
+STR_CARGO_SINGULAR_OIL.acc                                      :{G=n}Petroleum
 STR_CARGO_SINGULAR_OIL.dat                                      :{G=n}Petroleo
 STR_CARGO_SINGULAR_LIVESTOCK                                    :{G=np}Pecora
-STR_CARGO_SINGULAR_LIVESTOCK.acc                                :{G=np}Pecora
 STR_CARGO_SINGULAR_LIVESTOCK.gen                                :{G=np}pecorum
+STR_CARGO_SINGULAR_LIVESTOCK.acc                                :{G=np}Pecora
 STR_CARGO_SINGULAR_LIVESTOCK.dat                                :{G=np}Pecoribus
 STR_CARGO_SINGULAR_GOODS                                        :{G=fp}Merces
-STR_CARGO_SINGULAR_GOODS.acc                                    :{G=fp}Merces
 STR_CARGO_SINGULAR_GOODS.gen                                    :{G=fp}mercium
+STR_CARGO_SINGULAR_GOODS.acc                                    :{G=fp}Merces
 STR_CARGO_SINGULAR_GOODS.dat                                    :{G=fp}Mercibus
 STR_CARGO_SINGULAR_GRAIN                                        :{G=n}Frumentum
-STR_CARGO_SINGULAR_GRAIN.acc                                    :{G=n}Frumentum
 STR_CARGO_SINGULAR_GRAIN.gen                                    :{G=n}frumenti
+STR_CARGO_SINGULAR_GRAIN.acc                                    :{G=n}Frumentum
 STR_CARGO_SINGULAR_GRAIN.dat                                    :{G=n}Frumento
 STR_CARGO_SINGULAR_WOOD                                         :{G=n}Lignum
-STR_CARGO_SINGULAR_WOOD.acc                                     :{G=n}Lignum
 STR_CARGO_SINGULAR_WOOD.gen                                     :{G=n}ligni
+STR_CARGO_SINGULAR_WOOD.acc                                     :{G=n}Lignum
 STR_CARGO_SINGULAR_WOOD.dat                                     :{G=n}Ligno
 STR_CARGO_SINGULAR_IRON_ORE                                     :{G=n}Ferrum
-STR_CARGO_SINGULAR_IRON_ORE.acc                                 :{G=n}Ferrum
 STR_CARGO_SINGULAR_IRON_ORE.gen                                 :{G=n}ferri
+STR_CARGO_SINGULAR_IRON_ORE.acc                                 :{G=n}Ferrum
 STR_CARGO_SINGULAR_IRON_ORE.dat                                 :{G=n}Ferro
 STR_CARGO_SINGULAR_STEEL                                        :{G=m}Chalybs
-STR_CARGO_SINGULAR_STEEL.acc                                    :{G=m}Chalybem
 STR_CARGO_SINGULAR_STEEL.gen                                    :{G=m}chalybis
+STR_CARGO_SINGULAR_STEEL.acc                                    :{G=m}Chalybem
 STR_CARGO_SINGULAR_STEEL.dat                                    :{G=m}Chalybi
 STR_CARGO_SINGULAR_VALUABLES                                    :{G=fp}Res Pretiosa
-STR_CARGO_SINGULAR_VALUABLES.acc                                :{G=fp}Res Pretiosas
 STR_CARGO_SINGULAR_VALUABLES.gen                                :{G=fp}rerum pretiosarum
+STR_CARGO_SINGULAR_VALUABLES.acc                                :{G=fp}Res Pretiosas
 STR_CARGO_SINGULAR_VALUABLES.dat                                :{G=fp}Rebus Pretiosis
 STR_CARGO_SINGULAR_COPPER_ORE                                   :{G=n}Aes
-STR_CARGO_SINGULAR_COPPER_ORE.acc                               :{G=n}Aes
 STR_CARGO_SINGULAR_COPPER_ORE.gen                               :{G=n}aeris
+STR_CARGO_SINGULAR_COPPER_ORE.acc                               :{G=n}Aes
 STR_CARGO_SINGULAR_COPPER_ORE.dat                               :{G=n}Aeri
 STR_CARGO_SINGULAR_MAIZE                                        :{G=n}Maizium
-STR_CARGO_SINGULAR_MAIZE.acc                                    :{G=n}Maizium
 STR_CARGO_SINGULAR_MAIZE.gen                                    :{G=n}maizii
+STR_CARGO_SINGULAR_MAIZE.acc                                    :{G=n}Maizium
 STR_CARGO_SINGULAR_MAIZE.dat                                    :{G=n}Maizio
 STR_CARGO_SINGULAR_FRUIT                                        :{G=m}Fructus
-STR_CARGO_SINGULAR_FRUIT.acc                                    :{G=m}Fructum
 STR_CARGO_SINGULAR_FRUIT.gen                                    :{G=m}fructus
+STR_CARGO_SINGULAR_FRUIT.acc                                    :{G=m}Fructum
 STR_CARGO_SINGULAR_FRUIT.dat                                    :{G=m}Fructui
 STR_CARGO_SINGULAR_DIAMOND                                      :{G=mp}Adamantes
-STR_CARGO_SINGULAR_DIAMOND.acc                                  :{G=mp}Adamantes
 STR_CARGO_SINGULAR_DIAMOND.gen                                  :{G=mp}adamantum
+STR_CARGO_SINGULAR_DIAMOND.acc                                  :{G=mp}Adamantes
 STR_CARGO_SINGULAR_DIAMOND.dat                                  :{G=mp}Adamantibus
 STR_CARGO_SINGULAR_FOOD                                         :{G=m}Cibus
-STR_CARGO_SINGULAR_FOOD.acc                                     :{G=m}Cibum
 STR_CARGO_SINGULAR_FOOD.gen                                     :{G=m}cibi
+STR_CARGO_SINGULAR_FOOD.acc                                     :{G=m}Cibum
 STR_CARGO_SINGULAR_FOOD.dat                                     :{G=m}Cibo
 STR_CARGO_SINGULAR_PAPER                                        :{G=f}Charta
-STR_CARGO_SINGULAR_PAPER.acc                                    :{G=f}Chartam
 STR_CARGO_SINGULAR_PAPER.gen                                    :{G=f}chartae
+STR_CARGO_SINGULAR_PAPER.acc                                    :{G=f}Chartam
 STR_CARGO_SINGULAR_PAPER.dat                                    :{G=f}Chartae
 STR_CARGO_SINGULAR_GOLD                                         :{G=n}Aurum
-STR_CARGO_SINGULAR_GOLD.acc                                     :{G=n}Aurum
 STR_CARGO_SINGULAR_GOLD.gen                                     :{G=n}auri
+STR_CARGO_SINGULAR_GOLD.acc                                     :{G=n}Aurum
 STR_CARGO_SINGULAR_GOLD.dat                                     :{G=n}Auro
 STR_CARGO_SINGULAR_WATER                                        :{G=f}Aqua
-STR_CARGO_SINGULAR_WATER.acc                                    :{G=f}Aquam
 STR_CARGO_SINGULAR_WATER.gen                                    :{G=f}aquae
+STR_CARGO_SINGULAR_WATER.acc                                    :{G=f}Aquam
 STR_CARGO_SINGULAR_WATER.dat                                    :{G=f}Aquae
 STR_CARGO_SINGULAR_WHEAT                                        :{G=n}Triticum
-STR_CARGO_SINGULAR_WHEAT.acc                                    :{G=n}Triticum
 STR_CARGO_SINGULAR_WHEAT.gen                                    :{G=n}tritici
+STR_CARGO_SINGULAR_WHEAT.acc                                    :{G=n}Triticum
 STR_CARGO_SINGULAR_WHEAT.dat                                    :{G=n}Tritico
 STR_CARGO_SINGULAR_RUBBER                                       :{G=f}Gummis
-STR_CARGO_SINGULAR_RUBBER.acc                                   :{G=f}Gummem
 STR_CARGO_SINGULAR_RUBBER.gen                                   :{G=f}gummis
+STR_CARGO_SINGULAR_RUBBER.acc                                   :{G=f}Gummem
 STR_CARGO_SINGULAR_RUBBER.dat                                   :{G=f}Gummi
 STR_CARGO_SINGULAR_SUGAR                                        :{G=n}Saccharum
-STR_CARGO_SINGULAR_SUGAR.acc                                    :{G=n}Saccharum
 STR_CARGO_SINGULAR_SUGAR.gen                                    :{G=n}sacchari
+STR_CARGO_SINGULAR_SUGAR.acc                                    :{G=n}Saccharum
 STR_CARGO_SINGULAR_SUGAR.dat                                    :{G=n}Saccharo
 STR_CARGO_SINGULAR_TOY                                          :{G=np}Ludicra
-STR_CARGO_SINGULAR_TOY.acc                                      :{G=np}Ludicra
 STR_CARGO_SINGULAR_TOY.gen                                      :{G=np}Ludicrorum
+STR_CARGO_SINGULAR_TOY.acc                                      :{G=np}Ludicra
 STR_CARGO_SINGULAR_TOY.dat                                      :{G=np}Ludicris
 STR_CARGO_SINGULAR_CANDY                                        :{G=np}Bellaria
-STR_CARGO_SINGULAR_CANDY.acc                                    :{G=np}Bellaria
 STR_CARGO_SINGULAR_CANDY.gen                                    :{G=np}bellariorum
+STR_CARGO_SINGULAR_CANDY.acc                                    :{G=np}Bellaria
 STR_CARGO_SINGULAR_CANDY.dat                                    :{G=np}Bellariis
 STR_CARGO_SINGULAR_COLA                                         :{G=f}Cola
-STR_CARGO_SINGULAR_COLA.acc                                     :{G=f}Colam
 STR_CARGO_SINGULAR_COLA.gen                                     :{G=f}colae
+STR_CARGO_SINGULAR_COLA.acc                                     :{G=f}Colam
 STR_CARGO_SINGULAR_COLA.dat                                     :{G=f}Colae
 STR_CARGO_SINGULAR_COTTON_CANDY                                 :{G=n}Sacchari Xylinum
-STR_CARGO_SINGULAR_COTTON_CANDY.acc                             :{G=n}Sacchari Xylinum
 STR_CARGO_SINGULAR_COTTON_CANDY.gen                             :{G=n}sacchari xylini
+STR_CARGO_SINGULAR_COTTON_CANDY.acc                             :{G=n}Sacchari Xylinum
 STR_CARGO_SINGULAR_COTTON_CANDY.dat                             :{G=n}Sacchari Xylino
 STR_CARGO_SINGULAR_BUBBLE                                       :{G=fp}Bullae
-STR_CARGO_SINGULAR_BUBBLE.acc                                   :{G=fp}Bullas
 STR_CARGO_SINGULAR_BUBBLE.gen                                   :{G=fp}bullarum
+STR_CARGO_SINGULAR_BUBBLE.acc                                   :{G=fp}Bullas
 STR_CARGO_SINGULAR_BUBBLE.dat                                   :{G=fp}Bullis
 STR_CARGO_SINGULAR_TOFFEE                                       :{G=n}Saccharum Tostum
-STR_CARGO_SINGULAR_TOFFEE.acc                                   :{G=n}Saccharum Tostum
 STR_CARGO_SINGULAR_TOFFEE.gen                                   :{G=n}sacchari tosti
+STR_CARGO_SINGULAR_TOFFEE.acc                                   :{G=n}Saccharum Tostum
 STR_CARGO_SINGULAR_TOFFEE.dat                                   :{G=n}Saccharo Tosto
 STR_CARGO_SINGULAR_BATTERY                                      :{G=fp}Pilae Electricae
-STR_CARGO_SINGULAR_BATTERY.acc                                  :{G=fp}Pilas Electricas
 STR_CARGO_SINGULAR_BATTERY.gen                                  :{G=fp}pilarum electricarum
+STR_CARGO_SINGULAR_BATTERY.acc                                  :{G=fp}Pilas Electricas
 STR_CARGO_SINGULAR_BATTERY.dat                                  :{G=fp}Pilis Electricis
 STR_CARGO_SINGULAR_PLASTIC                                      :{G=f}Plastica
-STR_CARGO_SINGULAR_PLASTIC.acc                                  :{G=f}Plasticam
 STR_CARGO_SINGULAR_PLASTIC.gen                                  :{G=f}plasticae
+STR_CARGO_SINGULAR_PLASTIC.acc                                  :{G=f}Plasticam
 STR_CARGO_SINGULAR_PLASTIC.dat                                  :{G=f}Plasticae
 STR_CARGO_SINGULAR_FIZZY_DRINK                                  :{G=fp}Potiones Carbonatae
-STR_CARGO_SINGULAR_FIZZY_DRINK.acc                              :{G=fp}Potiones Carbonatas
 STR_CARGO_SINGULAR_FIZZY_DRINK.gen                              :{G=fp}potionum carbonatarum
+STR_CARGO_SINGULAR_FIZZY_DRINK.acc                              :{G=fp}Potiones Carbonatas
 STR_CARGO_SINGULAR_FIZZY_DRINK.dat                              :{G=fp}Potionibus Carbonatis
 
 # Quantity of cargo
@@ -467,7 +467,6 @@ STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Area: {N
 STR_SORT_BY_CAPTION_NAME                                        :{BLACK}Nomen
 STR_SORT_BY_CAPTION_DATE                                        :{BLACK}Dies
 # These are used in dropdowns
-# In ablative case to accompany "ordinare" [sort by]
 STR_SORT_BY_NAME                                                :Nomine
 STR_SORT_BY_PRODUCTION                                          :Productione
 STR_SORT_BY_TYPE                                                :Typo
@@ -477,7 +476,7 @@ STR_SORT_BY_PROFIT_LAST_YEAR                                    :Lucro prioris a
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Lucro huius anni
 STR_SORT_BY_AGE                                                 :Aetate
 STR_SORT_BY_RELIABILITY                                         :Constantia
-STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :Summa capacitatis cuiusque typo oneris
+STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :Summa capacitatis per genera onerum
 STR_SORT_BY_MAX_SPEED                                           :Velocitate maxima
 STR_SORT_BY_MODEL                                               :Typo
 STR_SORT_BY_VALUE                                               :Aestimatione
@@ -492,7 +491,7 @@ STR_SORT_BY_RATING_MIN                                          :Censione oneris
 STR_SORT_BY_ENGINE_ID                                           :Agnoscamento vehiculi (separatio antiqua)
 STR_SORT_BY_COST                                                :Pretio
 STR_SORT_BY_POWER                                               :Potestate
-STR_SORT_BY_TRACTIVE_EFFORT                                     :Vire tractione
+STR_SORT_BY_TRACTIVE_EFFORT                                     :Vi tractionis
 STR_SORT_BY_INTRO_DATE                                          :Die introductionis
 STR_SORT_BY_RUNNING_COST                                        :Pretio operandi
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Potestate pretio operandi divisa
@@ -869,6 +868,7 @@ STR_PLAYLIST_CLEAR                                              :{TINY_FONT}{BLA
 STR_PLAYLIST_TOOLTIP_CLEAR_CURRENT_PROGRAM_CUSTOM1              :{BLACK}Vacuefacere compositionem (modo Propriam I aut Propriam II)
 STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Preme in carmen ut compositioni addantur (modo Propriae I aut Propriae II)
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Preme in carmen ut ex compositione removeatur (modo Propria I aut Propria II)
+
 # Highscore window
 STR_HIGHSCORE_TOP_COMPANIES_WHO_REACHED                         :{BIG_FONT}{BLACK}Societates supremae quae attigerunt {NUM}
 STR_HIGHSCORE_TOP_COMPANIES_NETWORK_GAME                        :{BIG_FONT}{BLACK}Album Foederis Societatum in {NUM}
@@ -1027,14 +1027,12 @@ STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE
 STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} manens est in receptaculo
 STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} manens est in tugurio
 
-# Start of order review system
-# DON'T ADD OR REMOVE LINES HERE
+# Order review system / warnings
 STR_NEWS_VEHICLE_HAS_TOO_FEW_ORDERS                             :{WHITE}{VEHICLE} parum habet iussa in horario
 STR_NEWS_VEHICLE_HAS_VOID_ORDER                                 :{WHITE}{VEHICLE} iussum irritum habet
 STR_NEWS_VEHICLE_HAS_DUPLICATE_ENTRY                            :{WHITE}{VEHICLE} iussa duplicata habet
 STR_NEWS_VEHICLE_HAS_INVALID_ENTRY                              :{WHITE}{VEHICLE} stationem irritam habet in horario
 STR_NEWS_PLANE_USES_TOO_SHORT_RUNWAY                            :{WHITE}{VEHICLE} habet in iussis aeroportum cuius aerodromus nimis brevis est
-# end of order system
 
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} veterascit
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} valde veterascit
@@ -1281,7 +1279,7 @@ STR_CITY_APPROVAL_HOSTILE                                       :Brevissime
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Nullae IA parabiles sunt...{}Potes arcessere nunullas IA in 'Inventario Interretiale'
 
-# Advanced settings window
+# Settings tree window
 STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Electiones
 STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Series colans:
 STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Omnia expandere
@@ -1981,7 +1979,7 @@ STR_ABANDON_SCENARIO_QUERY                                      :{YELLOW}Esne ce
 
 # Cheat window
 STR_CHEATS                                                      :{WHITE}Tricae
-STR_CHEATS_TOOLTIP                                              :{BLACK}Signum {CHECKMARK} indicat trica iam a te usa est
+STR_CHEATS_TOOLTIP                                              :{BLACK}Quadra signi plena indicat trica iam a te usa est
 STR_CHEATS_WARNING                                              :{BLACK}Cave! Competitores tuas falsurus es! Memento tantam infamiam memoria omnium in aeternum teneri!
 STR_CHEAT_MONEY                                                 :{LTBLUE}Augere pecuniam {CURRENCY_LONG}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Ludens es in loco societatis: {ORANGE}{COMMA}
@@ -2374,7 +2372,7 @@ STR_NETWORK_SERVER_MESSAGE_GAME_REASON_GAME_SCRIPT              :a ludi scripto
 STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :exiens
 STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} ludum iungit
 STR_NETWORK_MESSAGE_CLIENT_JOINED_ID                            :*** {STRING} ludum iungit (Cliens #{2:NUM})
-STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} iungit societatem  #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} iungit societatem #{2:NUM}
 STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} spectatores iungit
 STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} novam societatem incipit (#{2:NUM})
 STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} ludum disiungit ({2:STRING})
@@ -2524,7 +2522,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Struere
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Mutare inter ferrivias, signalia, interlocos, et stationes struendas/removendas. Ctrl pressa, etiam astaria interlocorum stationumque removenda sunt.
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Mutare typum astarii. Shift mutat inter constructionem et aestimationem monstrandam
 
-# The following have adjectival forms rather than true genetives; see STR_LAI_RAIL_DESCRIPTION_TRACK et al.
 STR_RAIL_NAME_RAILROAD                                          :Ferrivia
 STR_RAIL_NAME_RAILROAD.gen                                      :Ferriviarium
 STR_RAIL_NAME_ELRAIL                                            :Ferrivia electrica
@@ -3158,7 +3155,6 @@ STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<industria irri
 # Placeholders for other invalid stuff, e.g. vehicles that have gone (Game Script).
 STR_INVALID_VEHICLE                                             :<vehiculum irritum>
 
-
 # NewGRF scanning window
 STR_NEWGRF_SCAN_CAPTION                                         :{WHITE}Fasciculos NewGRF inspiciens
 STR_NEWGRF_SCAN_MESSAGE                                         :{BLACK}Fasciculos NewGRF inspiciens. Fortasse diu erit si multi fasciculi adsunt...
@@ -3483,7 +3479,7 @@ STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}- Nulla
 STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO_LONG}{STRING}){YELLOW} ({COMMA}% translata)
 STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO_LONG}{STRING}/{CARGO_LONG}{STRING}){YELLOW} ({COMMA}%/{COMMA}% translata)
 STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
-STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Nomina industriarum - preme in nomen ut center main view on industry. Ctrl+Preme ut nova fenestra conspectus aperiatur supra industriam
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Nomina industriarum - preme in nomen ut conspectus moveatur supra industriam. Ctrl+Preme ut nova fenestra conspectus aperiatur supra industriam
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
@@ -3730,12 +3726,12 @@ STR_ENGINE_PREVIEW_SHIP                                         :{G=f}navis
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :{G=f}hamaxa monoorbitalis
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :{G=f}hamaxa maglev
 
-STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                       :{BLACK}Pretium: {CURRENCY_LONG} Pondus: {WEIGHT_SHORT}{}Velocitas: {VELOCITY}  Potestas: {POWER}{}Pretium Operandi: {CURRENCY_LONG} per annum{}Capacitas: {CARGO_LONG}
-STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE                :{BLACK}Pretium: {CURRENCY_LONG} Pondus: {WEIGHT_SHORT}{}Velocitas: {VELOCITY}  Potestas: {POWER}  V.T. Max.: {6:FORCE}{}Pretium Operandi: {4:CURRENCY_LONG} per annum{}Capacitas: {5:CARGO_LONG}
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST      :{BLACK}Pretium: {CURRENCY_LONG} Velocitas Maxima: {VELOCITY}{}Capacitas: {CARGO_LONG}, {CARGO_LONG}{}Pretium Operandi: {CURRENCY_LONG} per annum
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST               :{BLACK}Pretium: {CURRENCY_LONG} Velocitas Maxima: {VELOCITY}{}Capacitas: {CARGO_LONG}{}Pretium Operandi: {CURRENCY_LONG} per annum
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Pretium: {CURRENCY_LONG} Pondus: {WEIGHT_SHORT}{}Velocitas: {VELOCITY}  Potestas: {POWER}{}Pretium Operandi: {CURRENCY_LONG} per annum{}Capacitas: {CARGO_LONG}
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Pretium: {CURRENCY_LONG} Pondus: {WEIGHT_SHORT}{}Velocitas: {VELOCITY}  Potestas: {POWER}  V.T. Max.: {6:FORCE}{}Pretium Operandi: {4:CURRENCY_LONG} per annum{}Capacitas: {5:CARGO_LONG}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Pretium: {CURRENCY_LONG} Velocitas Maxima: {VELOCITY}{}Capacitas: {CARGO_LONG}, {CARGO_LONG}{}Pretium Operandi: {CURRENCY_LONG} per annum
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Pretium: {CURRENCY_LONG} Velocitas Maxima: {VELOCITY}{}Capacitas: {CARGO_LONG}{}Pretium Operandi: {CURRENCY_LONG} per annum
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Pretium: {CURRENCY_LONG} Velocitas Maxima: {VELOCITY} Range: {COMMA} tiles{}Capacitas: {CARGO_LONG}, {CARGO_LONG}{}Pretium Operandi: {CURRENCY_LONG} per annum
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST         :{BLACK}Pretium: {CURRENCY_LONG} Velocitas Maxima: {VELOCITY} Range: {COMMA} tiles{}Capacitas: {CARGO_LONG}{}Pretium Operandi: {CURRENCY_LONG} per annum
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Pretium: {CURRENCY_LONG} Velocitas Maxima: {VELOCITY} Range: {COMMA} tiles{}Capacitas: {CARGO_LONG}{}Pretium Operandi: {CURRENCY_LONG} per annum
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Mutare {STRING} - {STRING}
@@ -4718,155 +4714,154 @@ STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Argentaria Porc
 
 ##id 0x4800
 # industry names
-# Genetives are lowercase due to the context of their {STRING.gen} calls
 STR_INDUSTRY_NAME_COAL_MINE                                     :{G=f}Carbonifodina
+STR_INDUSTRY_NAME_COAL_MINE.gen                                 :{G=f}carbonifodinae
 STR_INDUSTRY_NAME_COAL_MINE.acc                                 :{G=f}Carbonifodinam
 STR_INDUSTRY_NAME_COAL_MINE.abl                                 :{G=f}Carbonifodina
-STR_INDUSTRY_NAME_COAL_MINE.gen                                 :{G=f}carbonifodinae
 STR_INDUSTRY_NAME_POWER_STATION                                 :{G=f}Electrificina
+STR_INDUSTRY_NAME_POWER_STATION.gen                             :{G=f}electrificinae
 STR_INDUSTRY_NAME_POWER_STATION.acc                             :{G=f}Electrificinam
 STR_INDUSTRY_NAME_POWER_STATION.abl                             :{G=f}Electrificina
-STR_INDUSTRY_NAME_POWER_STATION.gen                             :{G=f}electrificinae
 STR_INDUSTRY_NAME_SAWMILL                                       :{G=f}Serraria
+STR_INDUSTRY_NAME_SAWMILL.gen                                   :{G=f}serrariae
 STR_INDUSTRY_NAME_SAWMILL.acc                                   :{G=f}Serrariam
 STR_INDUSTRY_NAME_SAWMILL.abl                                   :{G=f}Serraria
-STR_INDUSTRY_NAME_SAWMILL.gen                                   :{G=f}serrariae
 STR_INDUSTRY_NAME_FOREST                                        :{G=f}Silva
+STR_INDUSTRY_NAME_FOREST.gen                                    :{G=f}silvae
 STR_INDUSTRY_NAME_FOREST.acc                                    :{G=f}Silvam
 STR_INDUSTRY_NAME_FOREST.abl                                    :{G=f}Silva
-STR_INDUSTRY_NAME_FOREST.gen                                    :{G=f}silvae
 STR_INDUSTRY_NAME_OIL_REFINERY                                  :{G=n}Ergasterium Petrolearium
+STR_INDUSTRY_NAME_OIL_REFINERY.gen                              :{G=n}ergasterii petrolearii
 STR_INDUSTRY_NAME_OIL_REFINERY.acc                              :{G=n}Ergasterium Petrolearium
 STR_INDUSTRY_NAME_OIL_REFINERY.abl                              :{G=n}Ergasterio Petroleario
-STR_INDUSTRY_NAME_OIL_REFINERY.gen                              :{G=n}ergasterii petrolearii
 STR_INDUSTRY_NAME_OIL_RIG                                       :{G=m}Suggestus Petrolearius
+STR_INDUSTRY_NAME_OIL_RIG.gen                                   :{G=m}suggestus petrolearii
 STR_INDUSTRY_NAME_OIL_RIG.acc                                   :{G=m}Suggestum Petrolearium
 STR_INDUSTRY_NAME_OIL_RIG.abl                                   :{G=m}Suggestu Petroleario
-STR_INDUSTRY_NAME_OIL_RIG.gen                                   :{G=m}suggestus petrolearii
 STR_INDUSTRY_NAME_FACTORY                                       :{G=f}Fabrica
+STR_INDUSTRY_NAME_FACTORY.gen                                   :{G=f}fabricae
 STR_INDUSTRY_NAME_FACTORY.acc                                   :{G=f}Fabricam
 STR_INDUSTRY_NAME_FACTORY.abl                                   :{G=f}Fabrica
-STR_INDUSTRY_NAME_FACTORY.gen                                   :{G=f}fabricae
 STR_INDUSTRY_NAME_PRINTING_WORKS                                :{G=n}Impressorium
+STR_INDUSTRY_NAME_PRINTING_WORKS.gen                            :{G=n}impressorii
 STR_INDUSTRY_NAME_PRINTING_WORKS.acc                            :{G=n}Impressorium
 STR_INDUSTRY_NAME_PRINTING_WORKS.abl                            :{G=n}Impressorio
-STR_INDUSTRY_NAME_PRINTING_WORKS.gen                            :{G=n}impressorii
 STR_INDUSTRY_NAME_STEEL_MILL                                    :{G=f}Fabrica Chalybeia
+STR_INDUSTRY_NAME_STEEL_MILL.gen                                :{G=f}fabricae chalybeiae
 STR_INDUSTRY_NAME_STEEL_MILL.acc                                :{G=f}Fabricam Chalybeiam
 STR_INDUSTRY_NAME_STEEL_MILL.abl                                :{G=f}Fabrica Chalybeia
-STR_INDUSTRY_NAME_STEEL_MILL.gen                                :{G=f}fabricae chalybeiae
 STR_INDUSTRY_NAME_FARM                                          :{G=m}Fundus
+STR_INDUSTRY_NAME_FARM.gen                                      :{G=m}fundi
 STR_INDUSTRY_NAME_FARM.acc                                      :{G=m}Fundum
 STR_INDUSTRY_NAME_FARM.abl                                      :{G=m}Fundo
-STR_INDUSTRY_NAME_FARM.gen                                      :{G=m}fundi
 STR_INDUSTRY_NAME_COPPER_ORE_MINE                               :{G=f}Aerifodina
+STR_INDUSTRY_NAME_COPPER_ORE_MINE.gen                           :{G=f}aerifodinae
 STR_INDUSTRY_NAME_COPPER_ORE_MINE.acc                           :{G=f}Aerifodinam
 STR_INDUSTRY_NAME_COPPER_ORE_MINE.abl                           :{G=f}Aerifodina
-STR_INDUSTRY_NAME_COPPER_ORE_MINE.gen                           :{G=f}aerifodinae
 STR_INDUSTRY_NAME_OIL_WELLS                                     :{G=mp}Putei Petrolearii
+STR_INDUSTRY_NAME_OIL_WELLS.gen                                 :{G=mp}puteorum petroleariorum
 STR_INDUSTRY_NAME_OIL_WELLS.acc                                 :{G=mp}Puteos Petrolearios
 STR_INDUSTRY_NAME_OIL_WELLS.abl                                 :{G=mp}Puteis Petroleariis
-STR_INDUSTRY_NAME_OIL_WELLS.gen                                 :{G=mp}puteorum petroleariorum
 STR_INDUSTRY_NAME_BANK                                          :{G=f}Argentaria
+STR_INDUSTRY_NAME_BANK.gen                                      :{G=f}argentariae
 STR_INDUSTRY_NAME_BANK.acc                                      :{G=f}Argentariam
 STR_INDUSTRY_NAME_BANK.abl                                      :{G=f}Argentaria
-STR_INDUSTRY_NAME_BANK.gen                                      :{G=f}argentariae
 STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT                         :{G=f}Fabrica Cibaria
+STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.gen                     :{G=f}fabricae cibariae
 STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.acc                     :{G=f}Fabricam Cibariam
 STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.abl                     :{G=f}Fabrica Cibaria
-STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT.gen                     :{G=f}fabricae cibariae
 STR_INDUSTRY_NAME_PAPER_MILL                                    :{G=f}Fabrica Chartaria
+STR_INDUSTRY_NAME_PAPER_MILL.gen                                :{G=f}fabricae chartariae
 STR_INDUSTRY_NAME_PAPER_MILL.acc                                :{G=f}Fabricam Chartariam
 STR_INDUSTRY_NAME_PAPER_MILL.abl                                :{G=f}Fabrica Chartaria
-STR_INDUSTRY_NAME_PAPER_MILL.gen                                :{G=f}fabricae chartariae
 STR_INDUSTRY_NAME_GOLD_MINE                                     :{G=f}Aurifodina
+STR_INDUSTRY_NAME_GOLD_MINE.gen                                 :{G=f}aurifodinae
 STR_INDUSTRY_NAME_GOLD_MINE.acc                                 :{G=f}Aurifodinam
 STR_INDUSTRY_NAME_GOLD_MINE.abl                                 :{G=f}Aurifodina
-STR_INDUSTRY_NAME_GOLD_MINE.gen                                 :{G=f}aurifodinae
 STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC                            :{G=f}Argentaria
+STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.gen                        :{G=f}argentariae
 STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.acc                        :{G=f}Argentariam
 STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.abl                        :{G=f}Argentaria
-STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC.gen                        :{G=f}argentariae
 STR_INDUSTRY_NAME_DIAMOND_MINE                                  :{G=f}Adamantifodina
+STR_INDUSTRY_NAME_DIAMOND_MINE.gen                              :{G=f}adamantifodinae
 STR_INDUSTRY_NAME_DIAMOND_MINE.acc                              :{G=f}Adamantifodinam
 STR_INDUSTRY_NAME_DIAMOND_MINE.abl                              :{G=f}Adamantifodina
-STR_INDUSTRY_NAME_DIAMOND_MINE.gen                              :{G=f}adamantifodinae
 STR_INDUSTRY_NAME_IRON_ORE_MINE                                 :{G=f}Ferrifodina
+STR_INDUSTRY_NAME_IRON_ORE_MINE.gen                             :{G=f}ferrifodinae
 STR_INDUSTRY_NAME_IRON_ORE_MINE.acc                             :{G=f}Ferrifodinam
 STR_INDUSTRY_NAME_IRON_ORE_MINE.abl                             :{G=f}Ferrifodina
-STR_INDUSTRY_NAME_IRON_ORE_MINE.gen                             :{G=f}ferrifodinae
 STR_INDUSTRY_NAME_FRUIT_PLANTATION                              :{G=n}Arbustum Fructuarium
+STR_INDUSTRY_NAME_FRUIT_PLANTATION.gen                          :{G=n}arbusti fructuarii
 STR_INDUSTRY_NAME_FRUIT_PLANTATION.acc                          :{G=n}Arbustum Fructuarium
 STR_INDUSTRY_NAME_FRUIT_PLANTATION.abl                          :{G=n}Arbusto Fructuario
-STR_INDUSTRY_NAME_FRUIT_PLANTATION.gen                          :{G=n}arbusti fructuarii
 STR_INDUSTRY_NAME_RUBBER_PLANTATION                             :{G=n}Arbustum Gummosum
+STR_INDUSTRY_NAME_RUBBER_PLANTATION.gen                         :{G=n}arbusti gummosi
 STR_INDUSTRY_NAME_RUBBER_PLANTATION.acc                         :{G=n}Arbustum Gummosum
 STR_INDUSTRY_NAME_RUBBER_PLANTATION.abl                         :{G=n}Arbusto Gummoso
-STR_INDUSTRY_NAME_RUBBER_PLANTATION.gen                         :{G=n}arbusti gummosi
 STR_INDUSTRY_NAME_WATER_SUPPLY                                  :{G=m}Fons Aquae
+STR_INDUSTRY_NAME_WATER_SUPPLY.gen                              :{G=m}fontis aquae
 STR_INDUSTRY_NAME_WATER_SUPPLY.acc                              :{G=m}Fontem Aquae
 STR_INDUSTRY_NAME_WATER_SUPPLY.abl                              :{G=m}Fonte Aquae
-STR_INDUSTRY_NAME_WATER_SUPPLY.gen                              :{G=m}fontis aquae
 STR_INDUSTRY_NAME_WATER_TOWER                                   :{G=f}Turris Aquaria
+STR_INDUSTRY_NAME_WATER_TOWER.gen                               :{G=f}turris aquariae
 STR_INDUSTRY_NAME_WATER_TOWER.acc                               :{G=f}Turrim Aquariam
 STR_INDUSTRY_NAME_WATER_TOWER.abl                               :{G=f}Turri Aquaria
-STR_INDUSTRY_NAME_WATER_TOWER.gen                               :{G=f}turris aquariae
 STR_INDUSTRY_NAME_FACTORY_2                                     :{G=f}Fabrica
+STR_INDUSTRY_NAME_FACTORY_2.gen                                 :{G=f}fabricae
 STR_INDUSTRY_NAME_FACTORY_2.acc                                 :{G=f}Fabricam
 STR_INDUSTRY_NAME_FACTORY_2.abl                                 :{G=f}Fabrica
-STR_INDUSTRY_NAME_FACTORY_2.gen                                 :{G=f}fabricae
 STR_INDUSTRY_NAME_FARM_2                                        :{G=m}Fundus
+STR_INDUSTRY_NAME_FARM_2.gen                                    :{G=m}fundi
 STR_INDUSTRY_NAME_FARM_2.acc                                    :{G=m}Fundum
 STR_INDUSTRY_NAME_FARM_2.abl                                    :{G=m}Fundo
-STR_INDUSTRY_NAME_FARM_2.gen                                    :{G=m}fundi
 STR_INDUSTRY_NAME_LUMBER_MILL                                   :{G=np}Castra Lignatorum
+STR_INDUSTRY_NAME_LUMBER_MILL.gen                               :{G=np}castrorum lignatorum
 STR_INDUSTRY_NAME_LUMBER_MILL.acc                               :{G=np}Castra Lignatorum
 STR_INDUSTRY_NAME_LUMBER_MILL.abl                               :{G=np}Castris Lignatorum
-STR_INDUSTRY_NAME_LUMBER_MILL.gen                               :{G=np}castrorum lignatorum
 STR_INDUSTRY_NAME_COTTON_CANDY_FOREST                           :{G=f}Silva Saccari Xylini
+STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.gen                       :{G=f}silvae saccari xylini
 STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.acc                       :{G=f}Silvam Saccari Xylini
 STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.abl                       :{G=f}Silva Saccari Xylini
-STR_INDUSTRY_NAME_COTTON_CANDY_FOREST.gen                       :{G=f}silvae saccari xylini
 STR_INDUSTRY_NAME_CANDY_FACTORY                                 :{G=f}Fabrica Bellarica
+STR_INDUSTRY_NAME_CANDY_FACTORY.gen                             :{G=f}fabricae bellaricae
 STR_INDUSTRY_NAME_CANDY_FACTORY.acc                             :{G=f}Fabricam Bellaricam
 STR_INDUSTRY_NAME_CANDY_FACTORY.abl                             :{G=f}Fabrica Bellarica
-STR_INDUSTRY_NAME_CANDY_FACTORY.gen                             :{G=f}fabricae bellaricae
 STR_INDUSTRY_NAME_BATTERY_FARM                                  :{G=m}Fundus Pilarum Electricarum
+STR_INDUSTRY_NAME_BATTERY_FARM.gen                              :{G=m}fundi pilarum electricarum
 STR_INDUSTRY_NAME_BATTERY_FARM.acc                              :{G=m}Fundum Pilarum Electricarum
 STR_INDUSTRY_NAME_BATTERY_FARM.abl                              :{G=m}Fundo Pilarum Electricarum
-STR_INDUSTRY_NAME_BATTERY_FARM.gen                              :{G=m}fundi pilarum electricarum
 STR_INDUSTRY_NAME_COLA_WELLS                                    :{G=mp}Putei Colae
+STR_INDUSTRY_NAME_COLA_WELLS.gen                                :{G=mp}puteorum colae
 STR_INDUSTRY_NAME_COLA_WELLS.acc                                :{G=mp}Puteos Colae
 STR_INDUSTRY_NAME_COLA_WELLS.abl                                :{G=mp}Puteis Colae
-STR_INDUSTRY_NAME_COLA_WELLS.gen                                :{G=mp}puteorum colae
 STR_INDUSTRY_NAME_TOY_SHOP                                      :{G=f}Taberna Ludicrorum
+STR_INDUSTRY_NAME_TOY_SHOP.gen                                  :{G=f}tabernae ludicrorum
 STR_INDUSTRY_NAME_TOY_SHOP.acc                                  :{G=f}Tabernam Ludicrorum
 STR_INDUSTRY_NAME_TOY_SHOP.abl                                  :{G=f}Taberna Ludicrorum
-STR_INDUSTRY_NAME_TOY_SHOP.gen                                  :{G=f}tabernae ludicrorum
 STR_INDUSTRY_NAME_TOY_FACTORY                                   :{G=f}Fabrica Ludicrorum
+STR_INDUSTRY_NAME_TOY_FACTORY.gen                               :{G=f}fabricae ludicrorum
 STR_INDUSTRY_NAME_TOY_FACTORY.acc                               :{G=f}Fabricam Ludicrorum
 STR_INDUSTRY_NAME_TOY_FACTORY.abl                               :{G=f}Fabrica Ludicrorum
-STR_INDUSTRY_NAME_TOY_FACTORY.gen                               :{G=f}fabricae ludicrorum
 STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS                             :{G=mp}Fontes Plasticae
+STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.gen                         :{G=mp}fontium plasticae
 STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.acc                         :{G=mp}Fontes Plasticae
 STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.abl                         :{G=mp}Fontibus Plasticae
-STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS.gen                         :{G=mp}fontium plasticae
 STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY                           :{G=f}Fabrica Potionum Carbonatarum
+STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.gen                       :{G=f}fabricae potionum carbonatarum
 STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.acc                       :{G=f}Fabricam Potionum Carbonatarum
 STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.abl                       :{G=f}Fabrica Potionum Carbonatarum
-STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY.gen                       :{G=f}fabricae potionum carbonatarum
 STR_INDUSTRY_NAME_BUBBLE_GENERATOR                              :{G=n}Generatrum Bullarum
+STR_INDUSTRY_NAME_BUBBLE_GENERATOR.gen                          :{G=n}generatri bullarum
 STR_INDUSTRY_NAME_BUBBLE_GENERATOR.acc                          :{G=n}Generatrum Bullarum
 STR_INDUSTRY_NAME_BUBBLE_GENERATOR.abl                          :{G=n}Generatro Bullarum
-STR_INDUSTRY_NAME_BUBBLE_GENERATOR.gen                          :{G=n}generatri bullarum
 STR_INDUSTRY_NAME_TOFFEE_QUARRY                                 :{G=fp}Lapicidinae Sacchari Tosti
+STR_INDUSTRY_NAME_TOFFEE_QUARRY.gen                             :{G=fp}lapicidinarum sacchari tosti
 STR_INDUSTRY_NAME_TOFFEE_QUARRY.acc                             :{G=fp}Lapicidinas Sacchari Tosti
 STR_INDUSTRY_NAME_TOFFEE_QUARRY.abl                             :{G=fp}Lapicidinis Sacchari Tosti
-STR_INDUSTRY_NAME_TOFFEE_QUARRY.gen                             :{G=fp}lapicidinarum sacchari tosti
 STR_INDUSTRY_NAME_SUGAR_MINE                                    :{G=f}Saccharifodina
+STR_INDUSTRY_NAME_SUGAR_MINE.gen                                :{G=f}saccharifodinae
 STR_INDUSTRY_NAME_SUGAR_MINE.acc                                :{G=f}Saccharifodinam
 STR_INDUSTRY_NAME_SUGAR_MINE.abl                                :{G=f}Saccharifodina
-STR_INDUSTRY_NAME_SUGAR_MINE.gen                                :{G=f}saccharifodinae
 
 ############ WARNING, using range 0x6000 for strings that are stored in the savegame
 ############ These strings may never get a new id, or savegames will break!
diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt
index 0878f25a5..98abbf506 100644
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -250,7 +250,15 @@ STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Ritjosla
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Nojaukt celtnes u.c. objektus no zemes platības. Ctrl iezīmē diagonālu laukumu. Shift pārslēdz nojaukšanu/izmaksu tāmes attēlošanu
 
 # Show engines button
+STR_SHOW_HIDDEN_ENGINES_VEHICLE_TRAIN                           :{BLACK}Parādīt paslēptos
+STR_SHOW_HIDDEN_ENGINES_VEHICLE_ROAD_VEHICLE                    :{BLACK}Parādīt paslēptos
+STR_SHOW_HIDDEN_ENGINES_VEHICLE_SHIP                            :{BLACK}Parādīt paslēptos
+STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT                        :{BLACK}Parādīt paslēptos
 
+STR_SHOW_HIDDEN_ENGINES_VEHICLE_TRAIN_TOOLTIP                   :{BLACK}Ieslēdzot šo iestatījumu tiks parādīti arī paslēptie vilcieni
+STR_SHOW_HIDDEN_ENGINES_VEHICLE_ROAD_VEHICLE_TOOLTIP            :{BLACK}Ieslēdzot šo iestatījumu tiks parādīti arī paslēptie autotransporta līdzekļi
+STR_SHOW_HIDDEN_ENGINES_VEHICLE_SHIP_TOOLTIP                    :{BLACK}Ieslēdzot šo iestatījumu tiks parādīti arī paslēptie kuģi
+STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP                :{BLACK}Ieslēdzot šo iestatījumu tiks parādīti arī paslēptie lidaparāti
 
 # Query window
 STR_BUTTON_DEFAULT                                              :{BLACK}Noklusējums
@@ -365,6 +373,7 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Iziet
 
 ############ range for settings menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spēles opcijas
+STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Iestatījumi
 STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :MI/spēles skriptu iestatījumi
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF iestatījumi
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Caurspīdības opcijas
@@ -969,6 +978,13 @@ STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Ekrāna
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Ekrāna izšķirtspējas izvēle
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Cita
 
+STR_GAME_OPTIONS_GUI_ZOOM_FRAME                                 :{BLACK}Lietotāja saskarnes izmērs
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_TOOLTIP                      :{BLACK}Izvēlaties lietotāja saskarnes elementu izmēru
+
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Standarta
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Divkāršs izmērs
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Kvadranta izmērs
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Pamata grafikas kopa
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Atlasīt lietošanai pamata grafikas kopu
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} iztrūkstošs/bojāts fail{P s i ""}
@@ -1068,7 +1084,8 @@ STR_CITY_APPROVAL_HOSTILE                                       :naidīga
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Nav pieejami derīgi MI...{}Jūs varat lejuplādēt dažādus MI, izmantojot sistēmu 'Tiešsaistes saturs'
 
-# Advanced settings window
+# Settings tree window
+STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Iestatījumi
 STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtra virkne:
 STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Izvērst visu
 STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Sakļaut visu
@@ -1082,9 +1099,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :uzņēmuma iest
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :uzņēmuma iestatījums (tiek iekļauts saglabājumā, ietekmē tikai pašreizējo uzņēmumu)
 
 STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Ierobežo turpmāko sarakstu, rādot tikai izmainītos iestatījumus
-STR_CONFIG_SETTING_RESTRICT_BASIC                               :Pamatiestatījumi
-STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Papildu iestatījumi
-STR_CONFIG_SETTING_RESTRICT_ALL                                 :Lietpratēju iestatījumi / visi iestatījumi
+STR_CONFIG_SETTING_RESTRICT_BASIC                               :Pamatiestatījumi (parādīt tikai svarīgākos iestatījumus)
+STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Papildu iestatījumi (parādīt iestatījumu vairākumu)
+STR_CONFIG_SETTING_RESTRICT_ALL                                 :Lietpratēju iestatījumi (parādīt visus iestatījumus, tai skaitā arī nestandarta)
 STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT             :Iestatījumi ar atšķirīgu vērtību nekā noklusējuma
 STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW                 :Iestatījumi ar atšķirīgu vērtību nekā jūsu jaunajai spēlei
 
@@ -1125,6 +1142,9 @@ STR_CONFIG_SETTING_TRAIN_REVERSING                              :Neatļaut vilci
 STR_CONFIG_SETTING_DISASTERS                                    :Katastrofas: {STRING}
 STR_CONFIG_SETTING_CITY_APPROVAL                                :Pilsētu domju attieksme pret platības pārstrukturēšanu: {STRING}
 
+STR_CONFIG_SETTING_MAX_HEIGHTLEVEL                              :Maksimālais kartes augstums: {STRING}
+STR_CONFIG_SETTING_MAX_HEIGHTLEVEL_HELPTEXT                     :Uzstādīt maksimālo atļauto kalnu augstumu kartē
+STR_CONFIG_SETTING_TOO_HIGH_MOUNTAIN                            :{WHITE}Jūs nevarat izmantot šo maksimālo kartes augstumu. Vismaz viens kalns uz kartes ir augstāks.
 STR_CONFIG_SETTING_AUTOSLOPE                                    :Atļaut ainavas veidošanu zem ekām, ceļiem, utt. (automāt. nogāzes): {STRING}
 STR_CONFIG_SETTING_AUTOSLOPE_HELPTEXT                           :Atļauj ainavas veidošanu zem ekām un ceļiem bez to nojaukšanas
 STR_CONFIG_SETTING_CATCHMENT                                    :Atļaut realistiskākas, palielinātas apkalpojamās platības: {STRING}
@@ -1153,6 +1173,7 @@ STR_CONFIG_SETTING_INFLATION                                    :Inflācija: {ST
 STR_CONFIG_SETTING_INFLATION_HELPTEXT                           :Atļaut inflāciju ekonomikā, kur izmaksu celšanās nedaudz apsteidz ienākumus
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH                            :Maksimālais tiltu garums: {STRING}
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH_HELPTEXT                   :Būvējamo tiltu maksimālais garums
+STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT                            :Maksimālais tiltu augstums: {STRING}
 STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH                            :Maksimālais tuneļu garums: {STRING}
 STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH_HELPTEXT                   :Būvējamo tuneļu maksimālais garums
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD             :Izejvielu ražotņu manuālā būvniecības metode: {STRING}
@@ -1551,13 +1572,13 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_METRIC              :metriskās (ZS)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_SI                  :SI, starptautiskās (kW)
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT                    :Svara mērvienības: {STRING}
-STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_HELPTEXT           :Vai lietotāja saskarnē rāda svaru, rādīt norādītajās mērvienībās
+STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_HELPTEXT           :Kad lietotāja saskarnē rāda svaru, uzrādīt to norādītajās mērvienībās
 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_IMPERIAL           :impērijas, britu (t/tonna)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_METRIC             :metriskās (t/tonna)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_SI                 :SI, starptautiskās (kg)
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME                    :Tilpuma mērvienības: {STRING}
-STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_HELPTEXT           :Vai lietotāja saskarnē rāda tilpumu, rādīt norādītajās mērvienībās
+STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_HELPTEXT           :Kad lietotāja saskarnē rāda tilpumu, uzrādīt to norādītajās mērvienībās
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_IMPERIAL           :impērijas, britu (galons)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_METRIC             :metriskās (l)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_SI                 :SI, starptautiskās (m³)
@@ -1565,13 +1586,13 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_SI.kas             :SI, starptautis
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE                     :Vilces spēka mērvienības: {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE.kas                 :Vilces spēka mērvienības: {STRING}
-STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_HELPTEXT            :Vai lietotāja saskarnē rāda vilcējspēku, rādīt norādītajās mērvienībās
+STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_HELPTEXT            :Kad lietotāja saskarnē rāda vilcējspēku, uzrādīt to norādītajās mērvienībās
 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_IMPERIAL            :impērijas, britu (mārciņa)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_METRIC              :metriskās (spēka kilograms)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_SI                  :SI, starptautiskās (kN)
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT                    :Augstuma mērvienības: {STRING}
-STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_HELPTEXT           :Vai lietotāja saskarnē rāda augstumu, rādīt norādītajās mērvienībās
+STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_HELPTEXT           :Kad lietotāja saskarnē rāda augstumu, uzrādīt to norādītajās mērvienībās
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :impērijas, britu (pēda)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :metriskās (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI, starptautiskās (m)
@@ -1634,6 +1655,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Vairāks
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Spēles opcijas
 STR_INTRO_HIGHSCORE                                             :{BLACK}Sasniegumu tabula
+STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Iestatījumi
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF iestatījumi
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Pārbaudīt tiešsaistes saturu
 STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}MI/spēles skriptu iestatījumi
@@ -1653,6 +1675,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Izvēlē
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Rādīt spēles opcijas
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Rādīt sasniegumu tabulu
+STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Displeja iestatījumi
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Rādīt NewGRF iestatījumus
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Pārbaudīt vai lejupielādei nav pieejams jauns un atjaunināts saturs
 STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Rādīt MI un spēles skriptu iestatījumus
@@ -1692,6 +1715,8 @@ STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Spēlē
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Burvju buldozers (nojauc ražotnes, nepārvietojamus objektus): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tuneļi drīkst krustoties: {ORANGE}{STRING}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Reaktīvās lidmašīnas mazajās lidostās neavarēs (bieži): {ORANGE}{STRING}
+STR_CHEAT_EDIT_MAX_HL                                           :{LTBLUE}Izmainīt maksimālo kartes augstumu: {ORANGE}{NUM}
+STR_CHEAT_EDIT_MAX_HL_QUERY_CAPT                                :{WHITE}Izmainīt kalnu maksimālo augstumu kartē
 STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Mērena klimata ainava
 STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Subarktikas klimata ainava
 STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Subtropu klimata ainava
@@ -2202,7 +2227,7 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Būvēt
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Būvēt vilcienu depo (vilcienu pirkšanai un apkopei). Shift pārslēdz būvi/rādīt izmaksu tāmi
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Pārveidot sliedes par pieturas punktu. Ctrl iespējo pieturas punktu apvienošanu. Shift pārslēdz būvēšanu/izmaksu tāmes rādīšanu
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Būvēt dzelzceļa staciju. Ctrl iespējo staciju apvienošanu. Shift pārslēdz būve/rādīt izmaksu tāmi
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Būvēt dzelzceļa signālus. Ctrl pārslēdz semaforus/luksoforus{}Vilkšana uzbūvē signālus uz taisna sliežu posma. Ctrl uzbūvē signālus līdz nākamajam sazarojumam{}Ctrl+klikšķis pārslēdz signālu izvēles loga atvēršanu. Shift pārslēdz būve/rādīt izmaksu tāmi
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Būvēt dzelzceļa signālus. Ctrl pārslēdz semaforus/luksoforus{}Vilkšana uzbūvē signālus uz taisna sliežu posma. Ctrl uzbūvē signālus līdz nākamajam sazarojumam vai signālam{}Ctrl+Klikšķis pārslēdz signālu izvēles loga atvēršanu. Shift pārslēdz starp būvet/rādīt izmaksu tāmi
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Būvēt dzelzceļa tiltu. Shift pārslēdz būvēšanu/izmaksu tāmes rādīšanu
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Būvēt dzelzceļa tuneli. Shift pārslēdz būvēšanu/izmaksu tāmes rādīšanu
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Pārslēgties starp sliežu, signālierīču, pieturas punktu būvēšanu/noņemšanu. Aizturēt Ctrl, lai noņemtu arī sliedes no pieturas punktiem un stacijām
@@ -2608,6 +2633,9 @@ STR_MAPGEN_BY                                                   :{BLACK}*
 STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Pilsētu daudzums:
 STR_MAPGEN_DATE                                                 :{BLACK}Datums:
 STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Ražotņu daudzums:
+STR_MAPGEN_MAX_HEIGHTLEVEL                                      :{BLACK}Maksimālais kartes augstums
+STR_MAPGEN_MAX_HEIGHTLEVEL_UP                                   :{BLACK}Palielināt kalnu maksimālo augstumu kartē par vienu vienību
+STR_MAPGEN_MAX_HEIGHTLEVEL_DOWN                                 :{BLACK}Samazināt kalnu maksimālu augstumu kartē par vienu vienību
 STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Sniega līnijas augstums
 STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Paaugstināt sniega līnijas augstumu
 STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Pazemināt sniega līnijas augstumu
@@ -2637,6 +2665,7 @@ STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Augstumu
 STR_MAPGEN_HEIGHTMAP_SIZE_LABEL                                 :{BLACK}Lielums:
 STR_MAPGEN_HEIGHTMAP_SIZE                                       :{ORANGE}{NUM} x {NUM}
 
+STR_MAPGEN_MAX_HEIGHTLEVEL_QUERY_CAPT                           :{WHITE}Mainīt kartes maksimālo augstumu
 STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Mainīt sniega līnijas augstumu
 STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Mainīt sākuma gadu
 
@@ -3287,8 +3316,20 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                     :{BLACK}Pārdēv
 STR_BUY_VEHICLE_SHIP_RENAME_TOOLTIP                             :{BLACK}Pārdēvēt kuģa tipu
 STR_BUY_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                         :{BLACK}Pārdēvēt lidaparāta tipu
 
+STR_BUY_VEHICLE_TRAIN_HIDE_TOGGLE_BUTTON                        :{BLACK}Paslēpt
+STR_BUY_VEHICLE_ROAD_VEHICLE_HIDE_TOGGLE_BUTTON                 :{BLACK}Paslēpt
+STR_BUY_VEHICLE_SHIP_HIDE_TOGGLE_BUTTON                         :{BLACK}Paslēpt
+STR_BUY_VEHICLE_AIRCRAFT_HIDE_TOGGLE_BUTTON                     :{BLACK}Paslēpt
 
+STR_BUY_VEHICLE_TRAIN_SHOW_TOGGLE_BUTTON                        :{BLACK}Rādīt
+STR_BUY_VEHICLE_ROAD_VEHICLE_SHOW_TOGGLE_BUTTON                 :{BLACK}Rādīt
+STR_BUY_VEHICLE_SHIP_SHOW_TOGGLE_BUTTON                         :{BLACK}Rādīt
+STR_BUY_VEHICLE_AIRCRAFT_SHOW_TOGGLE_BUTTON                     :{BLACK}Rādīt
 
+STR_BUY_VEHICLE_TRAIN_HIDE_SHOW_TOGGLE_TOOLTIP                  :{BLACK}Pārslēgt starp rādīt/nerādīt vilciena tipu
+STR_BUY_VEHICLE_ROAD_VEHICLE_HIDE_SHOW_TOGGLE_TOOLTIP           :{BLACK}Pārslēgt starp rādīt/nerādīt autotransporta līdzekļu tipu
+STR_BUY_VEHICLE_SHIP_HIDE_SHOW_TOGGLE_TOOLTIP                   :{BLACK}Pārslēgt starp rādīt/nerādīt kuģa tipu
+STR_BUY_VEHICLE_AIRCRAFT_HIDE_SHOW_TOGGLE_TOOLTIP               :{BLACK}Pārslēgt starp rādīt/nerādīt lidaparāta tipu
 
 STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Pārdēvēt vilciena vagona tipu
 STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Pārdēvēt autotransporta līdzekļa tipu
@@ -3343,7 +3384,7 @@ STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Klonēt
 STR_DEPOT_CLONE_SHIP                                            :{BLACK}Klonēt kuģi
 STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Klonēt lidaparātu
 
-STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Tas nopirks vilciena kopiju ar visiem vagoniem. Spiediet šo pogu un pēc tam uz vilciena, kas atrodas depo vai ārpus tā. Ctrl+klikšķis, lai koplietotu rīkojumus. Shift+klikšķis rāda izmaksu novērtējumu, neveicot pirkumu
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Nopirkt vilciena kopiju ar visiem vagoniem. Spiediet šo pogu, un pēc tam uz vilciena, kas atrodas depo vai ārpus tā. Ctrl+Klikšķis, lai koplietotu rīkojumus. Shift+Klikšķis rāda izmaksu novērtējumu, neveicot pirkumu
 STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Tas nopirks autotransporta kopiju. Spiediet uz pogas un pēc tam uz autotransporta, kas atrodas depo vai ārpus tā. Ctrl+klikšķis, lai koplietotu rīkojumus. Shift+klikšķis rāda izmaksu novērtējumu, neveicot pirkumu
 STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Tas nopirks kuģa kopiju. Spiediet šo pogu un pēc tam uz kuģa, kas atrodas depo vai ārpus tā. Ctrl+klikšķis, lai koplietotu rīkojumus. Shift+klikšķis rāda izmaksu novērtējumu, neveicot pirkumu
 STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Tas pirks lidaparāta kopiju. Spiediet uz pogas un pēc tam uz lidaparāta, kas atrodas angārā vai ārpus tā. Ctrl+klikšķis, lai koplietotu rīkojumus. Shift+klikšķis rāda izmaksu novērtējumu, neveicot pirkumu
@@ -4172,6 +4213,7 @@ STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Vispirms
 STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Nevar sākties un beigties tajā paša vietā
 STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Tilta gali nav vienā līmenī
 STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Tilts ir pārāk zems šim zemes apvidum
+STR_ERROR_BRIDGE_TOO_HIGH_FOR_TERRAIN                           :{WHITE}Tilts ir pārāk augsts priekš šī vilciena.
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Sākumam un beigām jābūt uz vienas līnijas
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... abiem tilta galiem jābūt uz zemes
 STR_ERROR_BRIDGE_TOO_LONG                                       :{WHITE}... tilts ir pārāk garš
@@ -4729,6 +4771,7 @@ STR_COMPANY_NAME                                                :{COMPANY}
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANY_NUM}
 STR_DEPOT_NAME                                                  :{DEPOT}
 STR_ENGINE_NAME                                                 :{ENGINE}
+STR_HIDDEN_ENGINE_NAME                                          :{ENGINE} (paslēpts)
 STR_GROUP_NAME                                                  :{GROUP}
 STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENT_NAME}
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index 543fe8535..8719808a9 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -984,6 +984,8 @@ STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Resoluci
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Seleccione la resolución de pantalla a usar
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Otras
 
+STR_GAME_OPTIONS_GUI_ZOOM_FRAME                                 :{BLACK}Tamaño de la interfaz
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_TOOLTIP                      :{BLACK}Elige el tamaño de los elementos de la interfaz a usar
 
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Tamaño doble