Merge branch 'master' into jgrpp

2024-01-09 17:33:32 +00:00
parent 6eaa3cf7f8 9a7c4dda52
commit 6492cec113
68 changed files with 106 additions and 74 deletions
--- a/src/currency.cpp
+++ b/src/currency.cpp
@@ -68,6 +68,7 @@ static const CurrencySpec origin_currency_specs[CURRENCY_END] = {
 	{   90, "", CF_NOEURO, u8"\u20b9",     "",               "INR", 0, STR_GAME_OPTIONS_CURRENCY_INR    }, ///< Indian Rupee
 	{   19, "", CF_NOEURO, "Rp",           "",               "IDR", 0, STR_GAME_OPTIONS_CURRENCY_IDR    }, ///< Indonesian Rupiah
 	{    5, "", CF_NOEURO, "RM",           "",               "MYR", 0, STR_GAME_OPTIONS_CURRENCY_MYR    }, ///< Malaysian Ringgit
+	{    1, "", 2014,      "",             NBSP "Ls",        "LVL", 1, STR_GAME_OPTIONS_CURRENCY_LVL    }, ///< latvian lats
 };

 /** Array of currencies used by the system */
--- a/src/currency.h
+++ b/src/currency.h
@@ -65,6 +65,7 @@ enum Currencies {
 	CURRENCY_INR,       ///< Indian Rupee
 	CURRENCY_IDR,       ///< Indonesian Rupiah
 	CURRENCY_MYR,       ///< Malaysian Ringgit
+	CURRENCY_LVL,       ///< Latvian Lats
 	CURRENCY_END,       ///< always the last item
 };

--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -890,7 +890,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Geldeenh
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Geld eendheid keuse


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Britse Pond
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Amerikaanse Dollar
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -884,7 +884,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}وحدة
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}اختيار وحدة العملة


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :جنية
 STR_GAME_OPTIONS_CURRENCY_USD                                   :دولار
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :يورو
--- a/src/lang/basque.txt
+++ b/src/lang/basque.txt
@@ -866,7 +866,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Diru uni
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Diru unitatearen aukeraketa


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dolar Amerikarrak
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euroa
--- a/src/lang/belarusian.txt
+++ b/src/lang/belarusian.txt
@@ -1199,7 +1199,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Валю
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Выбар валюты


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Брытанскі фунт
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Даляр ЗША
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Эўра
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -960,7 +960,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Seleçã

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libras Britânicas
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dólares Norte Americanos
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -872,7 +872,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Пари
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Избор на парична единица


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Британска лира
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Американски долар
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Евро
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -960,7 +960,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Selecci

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Lliura esterlina
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dòlar americà
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/chuvash.txt
+++ b/src/lang/chuvash.txt
@@ -474,7 +474,7 @@ STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Пӗлт



-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_RUR                                   :Вырӑсла тенкӗ

 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Хӑй управ
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -989,7 +989,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Novčane
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Izbor novčanih jedinica


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Funte
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Američki Dolar
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -1019,7 +1019,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Měna
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Výběr jednotek měny


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dolar
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -959,7 +959,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Valg af

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Britiske Pund
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Amerikanske dollars
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
@@ -1777,6 +1777,8 @@ STR_CONFIG_SETTING_SERVINT_DISABLED                             :Deaktiveret
 STR_CONFIG_SETTING_NOSERVICE                                    :Slå service fra, når nedbrud er sat til ingen: {STRING}
 STR_CONFIG_SETTING_NOSERVICE_HELPTEXT                           :Når tilladt, bliver køretøjer ikke serviceret, hvis de ikke kan bryde ned

+STR_CONFIG_SETTING_STATION_LENGTH_LOADING_PENALTY               :Læsningshastighedsstraf for tog, der er længere end stationen: {STRING}
+STR_CONFIG_SETTING_STATION_LENGTH_LOADING_PENALTY_HELPTEXT      :Når den er aktiveret, læsser et tog, der er for lange til stationen, langsommere end et tog, der passer til stationen. Denne indstilling påvirker ikke stifinding.

 STR_CONFIG_SETTING_WAGONSPEEDLIMITS                             :Aktiver hastighedsbegrænsning for vogne: {STRING}
 STR_CONFIG_SETTING_WAGONSPEEDLIMITS_HELPTEXT                    :Når tilladt, brug også fartgrænse på vogne, for at bestemme makshastigheden på tog
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -959,7 +959,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Valuta k

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Britse Pond
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollar
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -771,7 +771,7 @@ STR_SMALLMAP_LEGENDA_AIRCRAFT                                   :{TINY_FONT}{BLA
 STR_SMALLMAP_LEGENDA_TRANSPORT_ROUTES                           :{TINY_FONT}{BLACK}Transport Routes
 STR_SMALLMAP_LEGENDA_FOREST                                     :{TINY_FONT}{BLACK}Forest
 STR_SMALLMAP_LEGENDA_RAILROAD_STATION                           :{TINY_FONT}{BLACK}Railway Station
-STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY                          :{TINY_FONT}{BLACK}Lorry Loading Bay
+STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY                          :{TINY_FONT}{BLACK}Lorry Station
 STR_SMALLMAP_LEGENDA_BUS_STATION                                :{TINY_FONT}{BLACK}Bus Station
 STR_SMALLMAP_LEGENDA_AIRPORT_HELIPORT                           :{TINY_FONT}{BLACK}Airport/Heliport
 STR_SMALLMAP_LEGENDA_DOCK                                       :{TINY_FONT}{BLACK}Dock
@@ -959,7 +959,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Currency

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({RAW_STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :British Pound
 STR_GAME_OPTIONS_CURRENCY_USD                                   :American Dollar
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
@@ -1002,6 +1002,7 @@ STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hong Kong Dolla
 STR_GAME_OPTIONS_CURRENCY_INR                                   :Indian Rupee
 STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indonesian Rupiah
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaysian Ringgit
+STR_GAME_OPTIONS_CURRENCY_LVL                                   :Latvian Lats

 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Autosave
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Select interval between automatic game saves
@@ -2723,9 +2724,9 @@ STR_RAIL_TOOLBAR_MAGLEV_CONSTRUCTION_CAPTION                    :Maglev Construc
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                   :{BLACK}Build railway track. Ctrl toggles build/remove for railway construction. Shift toggles building/showing cost estimate
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Build railway track using the Autorail mode. Ctrl toggles build/remove for railway construction. Shift toggles building/showing cost estimate
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Build train depot (for buying and servicing trains). Shift toggles building/showing cost estimate
-STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Convert rail to waypoint. Ctrl enables joining waypoints. Shift toggles building/showing cost estimate
+STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Build waypoint on railway. Ctrl enables joining waypoints. Shift toggles building/showing cost estimate
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Build railway station. Ctrl enables joining stations. Shift toggles building/showing cost estimate
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Build railway signals. Ctrl toggles semaphore/light signals{}Dragging builds signals along a straight stretch of rail. Ctrl builds signals up to the next junction or signal{}Ctrl+Click toggles opening the signal selection window. Shift toggles building/showing cost estimate
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Build signal on railway. Ctrl toggles semaphore/light signals{}Dragging builds signals along a straight stretch of rail. Ctrl builds signals up to the next junction or signal{}Ctrl+Click toggles opening the signal selection window. Shift toggles building/showing cost estimate
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Build railway bridge. Shift toggles building/showing cost estimate
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Build railway tunnel. Shift toggles building/showing cost estimate
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Toggle build/remove for railway track, signals, waypoints and stations. Hold Ctrl to also remove the rail of waypoints and stations
@@ -2813,7 +2814,7 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}Build ro
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :{BLACK}Build tram vehicle depot (for buying and servicing vehicles). Shift toggles building/showing cost estimate
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION                      :{BLACK}Build bus station. Ctrl enables joining stations. Shift toggles building/showing cost estimate
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION           :{BLACK}Build passenger tram station. Ctrl enables joining stations. Shift toggles building/showing cost estimate
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY                :{BLACK}Build lorry loading bay. Ctrl enables joining stations. Shift toggles building/showing cost estimate
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY                :{BLACK}Build lorry station. Ctrl enables joining stations. Shift toggles building/showing cost estimate
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_CARGO_TRAM_STATION               :{BLACK}Build freight tram station. Ctrl enables joining stations. Shift toggles building/showing cost estimate
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Activate/Deactivate one way roads
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE                      :{BLACK}Build road bridge. Shift toggles building/showing cost estimate
@@ -2838,7 +2839,7 @@ STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Select t
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Bus Station Orientation
 STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Select bus station orientation
 STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Lorry Station Orientation
-STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Select lorry loading bay orientation
+STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Select lorry station orientation
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Passenger Tram Station Orientation
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Select passenger tram station orientation
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Freight Tram Station Orientation
@@ -3082,7 +3083,7 @@ STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Cactus plants
 STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Railway station
 STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Aircraft hangar
 STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Airport
-STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Lorry loading area
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Lorry station
 STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Bus station
 STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Ship dock
 STR_LAI_STATION_DESCRIPTION_BUOY                                :Buoy
--- a/src/lang/english_AU.txt
+++ b/src/lang/english_AU.txt
@@ -959,7 +959,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Currency

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :British Pound
 STR_GAME_OPTIONS_CURRENCY_USD                                   :American Dollar
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
@@ -2055,14 +2055,17 @@ STR_CONFIG_SETTING_ACCOUNTING                                   :Accounting
 STR_CONFIG_SETTING_VEHICLES                                     :Vehicles
 STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Physics
 STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Routing
+STR_CONFIG_SETTING_VEHICLES_ORDERS                              :Orders
 STR_CONFIG_SETTING_LIMITATIONS                                  :Limitations
 STR_CONFIG_SETTING_ACCIDENTS                                    :Disasters / Accidents
 STR_CONFIG_SETTING_GENWORLD                                     :World generation
 STR_CONFIG_SETTING_ENVIRONMENT                                  :Environment
+STR_CONFIG_SETTING_ENVIRONMENT_TIME                             :Time
 STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Authorities
 STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Towns
 STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Industries
 STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Cargo distribution
+STR_CONFIG_SETTING_ENVIRONMENT_TREES                            :Trees
 STR_CONFIG_SETTING_AI                                           :Competitors
 STR_CONFIG_SETTING_AI_NPC                                       :Computer players
 STR_CONFIG_SETTING_NETWORK                                      :Network
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -959,7 +959,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Currency

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :British Pound
 STR_GAME_OPTIONS_CURRENCY_USD                                   :American Dollar
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
@@ -1777,6 +1777,8 @@ STR_CONFIG_SETTING_SERVINT_DISABLED                             :Disabled
 STR_CONFIG_SETTING_NOSERVICE                                    :Disable maintenance when breakdowns are set to none: {STRING}
 STR_CONFIG_SETTING_NOSERVICE_HELPTEXT                           :When enabled, vehicles do not get maintained if they cannot break down

+STR_CONFIG_SETTING_STATION_LENGTH_LOADING_PENALTY               :Loading speed penalty for trains that are longer than the station: {STRING}
+STR_CONFIG_SETTING_STATION_LENGTH_LOADING_PENALTY_HELPTEXT      :When enabled, trains which are too long for the station load more slowly than a train which fits the station. This setting does not affect pathfinding.

 STR_CONFIG_SETTING_WAGONSPEEDLIMITS                             :Enable railroad car speed limits: {STRING}
 STR_CONFIG_SETTING_WAGONSPEEDLIMITS_HELPTEXT                    :When enabled, also use speed limits of wagons for deciding the maximum speed of a train
@@ -2053,14 +2055,17 @@ STR_CONFIG_SETTING_ACCOUNTING                                   :Accounting
 STR_CONFIG_SETTING_VEHICLES                                     :Vehicles
 STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Physics
 STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Routing
+STR_CONFIG_SETTING_VEHICLES_ORDERS                              :Orders
 STR_CONFIG_SETTING_LIMITATIONS                                  :Limitations
 STR_CONFIG_SETTING_ACCIDENTS                                    :Disasters / Accidents
 STR_CONFIG_SETTING_GENWORLD                                     :World generation
 STR_CONFIG_SETTING_ENVIRONMENT                                  :Environment
+STR_CONFIG_SETTING_ENVIRONMENT_TIME                             :Time
 STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Authorities
 STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Towns
 STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Industries
 STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Cargo distribution
+STR_CONFIG_SETTING_ENVIRONMENT_TREES                            :Trees
 STR_CONFIG_SETTING_AI                                           :Competitors
 STR_CONFIG_SETTING_AI_NPC                                       :Computer players
 STR_CONFIG_SETTING_NETWORK                                      :Network
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -1009,7 +1009,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Monunuoj
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Elekto de monunuoj


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Brita Pundo
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Usona Dolaro
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Eŭro
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -975,7 +975,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valuuta
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Valuuta valimine


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Suurbritannia nael
 STR_GAME_OPTIONS_CURRENCY_USD                                   :USA dollar
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/faroese.txt
+++ b/src/lang/faroese.txt
@@ -846,7 +846,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Gjaldsoy
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Úrval av gjaldsoyra eindum


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Bretsk Pund
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollarar
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Evrir
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -959,7 +959,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Rahayksi

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Englannin punta
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Yhdysvaltain dollari
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
@@ -2055,14 +2055,17 @@ STR_CONFIG_SETTING_ACCOUNTING                                   :Talous
 STR_CONFIG_SETTING_VEHICLES                                     :Kulkuneuvot
 STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Fysiikka
 STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Reititys
+STR_CONFIG_SETTING_VEHICLES_ORDERS                              :Käskyt
 STR_CONFIG_SETTING_LIMITATIONS                                  :Rajoitukset
 STR_CONFIG_SETTING_ACCIDENTS                                    :Onnettomuudet
 STR_CONFIG_SETTING_GENWORLD                                     :Maailman luominen
 STR_CONFIG_SETTING_ENVIRONMENT                                  :Ympäristö
+STR_CONFIG_SETTING_ENVIRONMENT_TIME                             :Aika
 STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Viranomaiset
 STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Kunnat
 STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Laitokset
 STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Rahdin jakautuminen
+STR_CONFIG_SETTING_ENVIRONMENT_TREES                            :Puut
 STR_CONFIG_SETTING_AI                                           :Kilpailijat
 STR_CONFIG_SETTING_AI_NPC                                       :Tietokonepelaajat
 STR_CONFIG_SETTING_NETWORK                                      :Verkko
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -960,7 +960,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Sélecti

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Livre
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollar
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
@@ -1778,6 +1778,8 @@ STR_CONFIG_SETTING_SERVINT_DISABLED                             :Désactivé
 STR_CONFIG_SETTING_NOSERVICE                                    :Désactiver l'entretien quand les pannes sont inactives{NBSP}: {STRING}
 STR_CONFIG_SETTING_NOSERVICE_HELPTEXT                           :Lorsqu'il est activé, les véhicules ne sont pas entretenus s'ils ne peuvent pas tomber en panne

+STR_CONFIG_SETTING_STATION_LENGTH_LOADING_PENALTY               :Pénalité de vitesse de chargement pour les trains plus long que les stations: {STRING}
+STR_CONFIG_SETTING_STATION_LENGTH_LOADING_PENALTY_HELPTEXT      :Quand activé, un train qui est trop long pour une station se charge plus lentement qu'un train qui fait la même taille que la station. Ce paramètre n'affecte pas la recherche de chemin.

 STR_CONFIG_SETTING_WAGONSPEEDLIMITS                             :Activer la vitesse limite des wagons{NBSP}: {STRING}
 STR_CONFIG_SETTING_WAGONSPEEDLIMITS_HELPTEXT                    :Lorsqu'il est activé, utiliser la vitesse limite des wagons pour déterminer la vitesse maximum d'un train
@@ -2054,14 +2056,17 @@ STR_CONFIG_SETTING_ACCOUNTING                                   :Comptabilité
 STR_CONFIG_SETTING_VEHICLES                                     :Véhicules
 STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Physique
 STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Routage
+STR_CONFIG_SETTING_VEHICLES_ORDERS                              :Ordres
 STR_CONFIG_SETTING_LIMITATIONS                                  :Limitations
 STR_CONFIG_SETTING_ACCIDENTS                                    :Catastrophes / Accidents
 STR_CONFIG_SETTING_GENWORLD                                     :Création du terrain
 STR_CONFIG_SETTING_ENVIRONMENT                                  :Environnement
+STR_CONFIG_SETTING_ENVIRONMENT_TIME                             :Temps
 STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Autorités
 STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Villes
 STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Industries
 STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Distribution des marchandises
+STR_CONFIG_SETTING_ENVIRONMENT_TREES                            :Arbres
 STR_CONFIG_SETTING_AI                                           :Compétiteurs
 STR_CONFIG_SETTING_AI_NPC                                       :Intelligence artificielle
 STR_CONFIG_SETTING_NETWORK                                      :Réseau
--- a/src/lang/frisian.txt
+++ b/src/lang/frisian.txt
@@ -883,7 +883,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Muntienh
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Muntienheidseleksje


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Britske Pûn
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Amerikaanske Dollars
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/gaelic.txt
+++ b/src/lang/gaelic.txt
@@ -1079,7 +1079,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Aonadan
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Tagh aonadan airgeadra


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Not Breatannach
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dolar Aimeireaganach
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Eòro
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -957,7 +957,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Selecci

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra esterlina
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dólar americano
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -956,7 +956,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Währung

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Britische Pfund
 STR_GAME_OPTIONS_CURRENCY_USD                                   :US-Dollar
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/greek.txt
+++ b/src/lang/greek.txt
@@ -1024,7 +1024,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Νομι
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Επιλογή νομισματικών μονάδων


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Στερλίνα Ηνωμένου Βασιλείου
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Δολλάριο Η.Π.Α.
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Ευρώ
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -895,7 +895,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}מטבע
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}בחירת מטבע


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :לירה שטרלינג
 STR_GAME_OPTIONS_CURRENCY_USD                                   :דולר אמריקאי
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :יורו
--- a/src/lang/hindi.txt
+++ b/src/lang/hindi.txt
@@ -277,7 +277,7 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}इस



-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_FIM                                   :फिनलैंड मार्का
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :आइसलैंडिक क्रोना
 STR_GAME_OPTIONS_CURRENCY_HKD                                   :हाँग काँग डॉलर
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -1019,7 +1019,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}A haszn

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Angol Font
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Amerikai Dollár
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euró
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -845,7 +845,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Gjaldmi
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Val á gjaldmiðli


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Sterlingspund
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Bandaríkjadalur
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Evra
--- a/src/lang/ido.txt
+++ b/src/lang/ido.txt
@@ -464,7 +464,7 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Ludo Sel



-###length 42
+###length 43


 # Autosave dropdown
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -955,7 +955,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Pilih ma

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Poundsterling
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollar
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/irish.txt
+++ b/src/lang/irish.txt
@@ -907,7 +907,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Aonaid a
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Aonaid airgeadra a roghnú


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Punt na Breataine
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollar Mheiriceá
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -961,7 +961,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Selezion

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Sterlina britannica
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollaro americano
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -933,7 +933,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}通貨
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}通貨単位の選択


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :英ポンド
 STR_GAME_OPTIONS_CURRENCY_USD                                   :米ドル
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :欧州連合・ユーロ
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -960,7 +960,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}화폐

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :영국 파운드
 STR_GAME_OPTIONS_CURRENCY_USD                                   :미국 달러
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :유로
@@ -1778,6 +1778,8 @@ STR_CONFIG_SETTING_SERVINT_DISABLED                             :사용 안 함
 STR_CONFIG_SETTING_NOSERVICE                                    :차량 고장 설정을 껐으면 점검을 하지 않음: {STRING}
 STR_CONFIG_SETTING_NOSERVICE_HELPTEXT                           :이 설정을 켜면, 차량이 고장나지 않도록 설정되어 있는 경우 차량이 자동으로 점검을 하러 가지 않습니다

+STR_CONFIG_SETTING_STATION_LENGTH_LOADING_PENALTY               :역 길이보다 열차 길이가 긴 경우 적재 속도 감소: {STRING}
+STR_CONFIG_SETTING_STATION_LENGTH_LOADING_PENALTY_HELPTEXT      :이 설정을 켜면, 역 길이보다 길이가 긴 열차는 역 길이에 맞는 열차보다 적재/하차 속도가 느려지게 됩니다. 이 설정은 경로 탐색에는 영향을 미치지 않습니다.

 STR_CONFIG_SETTING_WAGONSPEEDLIMITS                             :화물차 속력 제한 적용: {STRING}
 STR_CONFIG_SETTING_WAGONSPEEDLIMITS_HELPTEXT                    :이 설정을 켜면, 화물차의 속력 제한값에 따라 열차의 최대 속력을 제한합니다.
@@ -2054,14 +2056,17 @@ STR_CONFIG_SETTING_ACCOUNTING                                   :회계
 STR_CONFIG_SETTING_VEHICLES                                     :차량
 STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :물리
 STR_CONFIG_SETTING_VEHICLES_ROUTING                             :경로
+STR_CONFIG_SETTING_VEHICLES_ORDERS                              :경로
 STR_CONFIG_SETTING_LIMITATIONS                                  :제한
 STR_CONFIG_SETTING_ACCIDENTS                                    :재앙 / 사고
 STR_CONFIG_SETTING_GENWORLD                                     :세계 제작
 STR_CONFIG_SETTING_ENVIRONMENT                                  :환경
+STR_CONFIG_SETTING_ENVIRONMENT_TIME                             :시간
 STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :지역 당국
 STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :도시
 STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :산업시설
 STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :화물 분배
+STR_CONFIG_SETTING_ENVIRONMENT_TREES                            :나무
 STR_CONFIG_SETTING_AI                                           :경쟁자
 STR_CONFIG_SETTING_AI_NPC                                       :컴퓨터 플레이어
 STR_CONFIG_SETTING_NETWORK                                      :네트워크
--- a/src/lang/latin.txt
+++ b/src/lang/latin.txt
@@ -1070,7 +1070,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Unitates
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Electio unitatum nummi


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra Britannica
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollarium CFA
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -961,7 +961,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Naudas v

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Lielbritānijas sterliņu mārciņas
 STR_GAME_OPTIONS_CURRENCY_USD                                   :ASV dolāri
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Eiro
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -1118,7 +1118,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valiuta
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Valiutos pasirinkimas


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Svarai sterlingų
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Amerikos Doleris
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Eurai
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -918,7 +918,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Währung
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Währungseenheet wielen


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Pond
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollar
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/macedonian.txt
+++ b/src/lang/macedonian.txt
@@ -780,7 +780,7 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Опци



-###length 42
+###length 43


 # Autosave dropdown
--- a/src/lang/malay.txt
+++ b/src/lang/malay.txt
@@ -850,7 +850,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Unit kew
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Pilihan unit kewangan


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Paun British
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dolar Amerika
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/maltese.txt
+++ b/src/lang/maltese.txt
@@ -397,7 +397,7 @@ STR_NEWS_VEHICLE_IS_LOST                                        :{WHITE}{VEHICLE



-###length 42
+###length 43


 # Autosave dropdown
--- a/src/lang/marathi.txt
+++ b/src/lang/marathi.txt
@@ -688,7 +688,7 @@ STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIG_FONT}{BLAC



-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :पौंड
 STR_GAME_OPTIONS_CURRENCY_USD                                   :डोल्लर
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :युरो
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -911,7 +911,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valutaen
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Velg valutaenhet som skal brukes


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Britisk pund
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Amerikansk dollar
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -876,7 +876,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valutaei
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Vel valutaeining


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Pund
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollar
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/persian.txt
+++ b/src/lang/persian.txt
@@ -866,7 +866,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}واحد
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}انتخب واحد پول


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :پوند
 STR_GAME_OPTIONS_CURRENCY_USD                                   :دلار
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :یورو
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -1339,7 +1339,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Wybór w

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Funt brytyjski
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dolar amerykański
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -960,7 +960,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Selecç

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra Britânica
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dólar dos E.U.A.
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -956,7 +956,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Alege un

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Liră sterlină
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dolar american
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -1104,7 +1104,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Смен

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Английский фунт
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Доллар США
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Евро
@@ -2206,14 +2206,17 @@ STR_CONFIG_SETTING_ACCOUNTING                                   :Финансы
 STR_CONFIG_SETTING_VEHICLES                                     :Транспорт
 STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Физическая модель
 STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Маршруты
+STR_CONFIG_SETTING_VEHICLES_ORDERS                              :Задания
 STR_CONFIG_SETTING_LIMITATIONS                                  :Ограничения
 STR_CONFIG_SETTING_ACCIDENTS                                    :Аварии и катастрофы
 STR_CONFIG_SETTING_GENWORLD                                     :Создание карты
 STR_CONFIG_SETTING_ENVIRONMENT                                  :Окружение
+STR_CONFIG_SETTING_ENVIRONMENT_TIME                             :Время
 STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Городская администрация
 STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Города
 STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Предприятия
 STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Распределение грузов
+STR_CONFIG_SETTING_ENVIRONMENT_TREES                            :Деревья
 STR_CONFIG_SETTING_AI                                           :Конкуренты
 STR_CONFIG_SETTING_AI_NPC                                       :Искусственный интеллект
 STR_CONFIG_SETTING_NETWORK                                      :Сеть
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -1113,7 +1113,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valuta
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Izbor valute


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Britanska funta
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dolar
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Evro
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -441,7 +441,7 @@ STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :显示其他公
 STR_SETTINGS_MENU_FULL_ANIMATION                                :完全动画
 STR_SETTINGS_MENU_FULL_DETAIL                                   :完全细节
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :透明建筑
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :透明车站标志
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :透明标志

 # File menu
 STR_FILE_MENU_SAVE_GAME                                         :保存游戏
@@ -959,7 +959,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}货币

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :英镑
 STR_GAME_OPTIONS_CURRENCY_USD                                   :美元
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :欧元
@@ -2055,14 +2055,17 @@ STR_CONFIG_SETTING_ACCOUNTING                                   :财务管理
 STR_CONFIG_SETTING_VEHICLES                                     :车辆
 STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :物理
 STR_CONFIG_SETTING_VEHICLES_ROUTING                             :经由
+STR_CONFIG_SETTING_VEHICLES_ORDERS                              :调度命令
 STR_CONFIG_SETTING_LIMITATIONS                                  :限制
 STR_CONFIG_SETTING_ACCIDENTS                                    :灾难/事故
 STR_CONFIG_SETTING_GENWORLD                                     :生成地图
 STR_CONFIG_SETTING_ENVIRONMENT                                  :环境
+STR_CONFIG_SETTING_ENVIRONMENT_TIME                             :时间
 STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :政府监管
 STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :城镇
 STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :工业设施
 STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :货物分配
+STR_CONFIG_SETTING_ENVIRONMENT_TREES                            :树木
 STR_CONFIG_SETTING_AI                                           :竞争
 STR_CONFIG_SETTING_AI_NPC                                       :电脑玩家
 STR_CONFIG_SETTING_NETWORK                                      :网络
@@ -2784,7 +2787,7 @@ STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}增加
 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}选择铁路桥
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}选择公路桥梁
-STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}选择桥梁 - 点击选择喜欢的桥梁进行建设
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}选择桥梁 - 点击选择桥梁进行建设
 STR_SELECT_BRIDGE_INFO_NAME                                     :{GOLD}{STRING}
 STR_SELECT_BRIDGE_INFO_NAME_MAX_SPEED                           :{GOLD}{STRING},{} {VELOCITY}
 STR_SELECT_BRIDGE_INFO_NAME_COST                                :{GOLD}{0:STRING},{} {WHITE}{2:CURRENCY_LONG}
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -1016,7 +1016,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Výber m

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra šterlingov
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Americký dolár
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -1030,7 +1030,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valute
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Izbira valut


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Funt
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dolar
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -919,7 +919,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Unidad m
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Selecciona la nnidad monetaria


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra británica
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dólar estadounidense
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/spanish_MX.txt
+++ b/src/lang/spanish_MX.txt
@@ -919,7 +919,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Divisa
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Elegir divisa


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra británica
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dólar estadounidense
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -951,7 +951,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Välj va

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Brittiskt pund
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Amerikansk dollar
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/tamil.txt
+++ b/src/lang/tamil.txt
@@ -878,7 +878,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}நா
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}நாணய பிரிவு தேர்ந்தெடுத்தல்


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :பிரித்தானிய பவுண்டு
 STR_GAME_OPTIONS_CURRENCY_USD                                   :அமெரிக்கன் டாலர்
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :யுரோ
--- a/src/lang/thai.txt
+++ b/src/lang/thai.txt
@@ -889,7 +889,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}หน
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}การเลือกสกุลเงิน


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :ปอนด์สเตอร์ลิง
 STR_GAME_OPTIONS_CURRENCY_USD                                   :ดอลลาร์สหรัฐ
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :ยูโร
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -951,7 +951,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}選擇

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :英鎊
 STR_GAME_OPTIONS_CURRENCY_USD                                   :美元
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :歐元
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -960,7 +960,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Para bir

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Sterlin
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Amerikan Doları
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Avro
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -1061,7 +1061,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Грош
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Виберіть грошову одиницю


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Британський фунт
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Американський долар
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Євро
--- a/src/lang/urdu.txt
+++ b/src/lang/urdu.txt
@@ -843,7 +843,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}کرنس
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}کرنسی کی اکائی اختیار کریں


-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :برطانوی پاونڈ
 STR_GAME_OPTIONS_CURRENCY_USD                                   :امریکی ڈالر
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :یورو
--- a/src/lang/vietnamese.txt
+++ b/src/lang/vietnamese.txt
@@ -959,7 +959,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Lựa ch

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Bảng Anh
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Đô-la Mỹ
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -896,7 +896,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Dewis un

 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})

-###length 42
+###length 43
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Punnoedd Prydeinig
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Doleri America
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Ewro
--- a/src/table/settings/locale_settings.ini
+++ b/src/table/settings/locale_settings.ini
@@ -10,7 +10,7 @@
 [pre-amble]
 uint8_t _old_units;                                      ///< Old units from old savegames

-static constexpr std::initializer_list<const char*> _locale_currencies{"GBP", "USD", "EUR", "JPY", "ATS", "BEF", "CHF", "CZK", "DEM", "DKK", "ESP", "FIM", "FRF", "GRD", "HUF", "ISK", "ITL", "NLG", "NOK", "PLN", "RON", "RUR", "SIT", "SEK", "TRY", "SKK", "BRL", "EEK", "LTL", "KRW", "ZAR", "custom", "GEL", "IRR", "RUB", "MXN", "NTD", "CNY", "HKD", "INR", "IDR", "MYR"};
+static constexpr std::initializer_list<const char*> _locale_currencies{"GBP", "USD", "EUR", "JPY", "ATS", "BEF", "CHF", "CZK", "DEM", "DKK", "ESP", "FIM", "FRF", "GRD", "HUF", "ISK", "ITL", "NLG", "NOK", "PLN", "RON", "RUR", "SIT", "SEK", "TRY", "SKK", "BRL", "EEK", "LTL", "KRW", "ZAR", "custom", "GEL", "IRR", "RUB", "MXN", "NTD", "CNY", "HKD", "INR", "IDR", "MYR", "LVL"};
 static constexpr std::initializer_list<const char*> _locale_units{"imperial", "metric", "si", "gameunits"};

 static_assert(_locale_currencies.size() == CURRENCY_END);