Add client setting for vehicle naming scheme

src/lang/afrikaans.txt

@@ -4607,6 +4607,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Oorspronklike T
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Oorspronklike Transport Tycoon (Original/World Editor) musiek van die DOS-uitgawe.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :'n Musiek stel sonder enige musiek.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Trein {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Pad Voertuig {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Skip {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Vliegtuig {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Hoog kantoor blok

src/lang/arabic_egypt.txt

@@ -3904,6 +3904,11 @@ STR_BASESOUNDS_NONE_DESCRIPTION                                 :مجموعة ص
 STR_BASEMUSIC_WIN_DESCRIPTION                                   :النسخة الاصلية من ترانسبورت تايكون ديلوكس الموسيقية نسخة وندوز
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :مجموعة موسيقى بدون موسيقى
 
+STR_TRADITIONAL_TRAIN_NAME                                      :قطار {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :عربة {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :سفينة {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :طائرة {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :مبنى مكاتب عالي

src/lang/basque.txt

@@ -4320,6 +4320,11 @@ STR_BASESOUNDS_WIN_DESCRIPTION                                  :Transport Tycoo
 STR_BASESOUNDS_NONE_DESCRIPTION                                 :Soinurik gabeko soinu pakete bat
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Musika gabeko musika paketea.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Trena {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Errepide ibilgailua {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Itsasontzia {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Hegazkina {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Ofizina eraikin handia

src/lang/belarusian.txt

@@ -4925,6 +4925,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Набор му
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Набор музычнага афармлення з гульні Transport Tycoon (Original/World Editor) для DOS.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :"Пусты" набор музычнага афармлення, які не зьмяшчае ніякай музыкі.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Цягнiк {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Аўтамабiль {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Карабель {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Самалёт {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Вышынны офісны будынак

src/lang/brazilian_portuguese.txt

@@ -4643,6 +4643,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Música Origina
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Música Original do Transport Tycoon DOS
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Um pacote de músicas sem músicas.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Trem {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Automóvel {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Embarcação {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Aeronave {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Edifício alto de escritórios

src/lang/bulgarian.txt

@@ -4419,6 +4419,11 @@ STR_BASEMUSIC_WIN_DESCRIPTION                                   :Оригина
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Оригинална Transport Tycoon (Original/World Editor) музика за DOS.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Празен музикален пакет.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Влак {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Автомобил {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Кораб {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Самолет {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Висока офис сграда

src/lang/catalan.txt

@@ -4643,6 +4643,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Música origina
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Música original del Transport Tycoon Deluxe (original/editor d'escenaris) pel DOS.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Una llista de música sense cap peça.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :{G=Masculin}Tren {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :{G=Masculin}Automòbil {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :{G=Masculin}Vaixell {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :{G=Masculin}Avió {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Bloc d'oficines alt

src/lang/croatian.txt

@@ -4738,6 +4738,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Originalna glaz
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Originalna glazba za Transport Tycoon (original/editor svijeta) DOS izdanje.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Glazbeni paket bez ikakve glazbe.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Vlak {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Cestovno vozilo {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Brod {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Zrakoplov {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Visoki uredski blok

src/lang/czech.txt

@@ -5273,6 +5273,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Původní hudba
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Původní hudba Transport Tycoon (verze pro DOS).
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Prázná hudební sada.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :{G=m}Vlak {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :{G=n}Silniční vozidlo {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :{G=f}Loď {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :{G=n}Letadlo {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Vysoký kancelářský blok

src/lang/danish.txt

@@ -4643,6 +4643,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Originalmusik f
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Originalmusik fra Transport Tycoon (Original/World Editor) DOS-version.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :En musikpakke uden musik.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Tog {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Vejkøretøj {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Skib {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Fly {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Høj kontorbygning

src/lang/dutch.txt

@@ -4642,6 +4642,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Originele muzie
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Originele muziek van Transport Tycoon (Original/World Editor) voor DOS.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Een muziekset zonder muziek.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Trein {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Wegvoertuig {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Schip {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Vliegtuig {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Hoog kantoorgebouw

src/lang/english.txt

@@ -1399,6 +1399,12 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE                  :Greyscale
 STR_CONFIG_SETTING_DISABLE_VEHICLE_IMAGE_UPDATE                 :Disable vehicle image update: {STRING2}
 STR_CONFIG_SETTING_DISABLE_VEHICLE_IMAGE_UPDATE_HELPTEXT        :When enabled, prevent NewGRF vehicles from continuously updating the sprite used to draw vehicles as the vehicle moves. This can be used to prevent performance problems when there are many vehicles from computationally expensive NewGRFs.
 
+STR_CONFIG_SETTING_VEHICLE_NAMES                                :Vehicle names: {STRING2}
+STR_CONFIG_SETTING_VEHICLE_NAMES_HELPTEXT                       :Set the naming scheme used for vehicle names. This does not apply to vehicles which have a custom name.
+STR_CONFIG_SETTING_VEHICLE_NAMES_TRADITIONAL                    :Traditional
+STR_CONFIG_SETTING_VEHICLE_NAMES_MODERN                         :Modern
+STR_CONFIG_SETTING_VEHICLE_NAMES_LONG                           :Long
+
 STR_CONFIG_SETTING_ADV_SIG_BRIDGE_TUN_MODES                     :Enable signals on bridges/tunnels advanced modes: {STRING2}
 STR_CONFIG_SETTING_ADV_SIG_BRIDGE_TUN_MODES_HELPTEXT            :Enables use of advanced modes of signal simulation on bridges and tunnels. When disabled, bridges/tunnels which are not already in an advanced mode cannot be changed to an advanced mode, however other players may choose to enable this setting and use an advanced mode.
 
@@ -5744,6 +5750,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Original Transp
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Original Transport Tycoon (Original/World Editor) DOS edition music.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :A music pack without actual music.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Train {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Road Vehicle {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Ship {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Aircraft {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Tall office block
@@ -6140,6 +6151,8 @@ STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
 STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} Waypoint
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} Waypoint #{COMMA}
 
+STR_FORMAT_GROUP_VEHICLE_NAME_LONG                              :{GROUP} - {STRING1}
+
 STR_FORMAT_DEPOT_NAME_TRAIN                                     :{TOWN} Train Depot
 STR_FORMAT_DEPOT_NAME_TRAIN_SERIAL                              :{TOWN} Train Depot #{COMMA}
 STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE                              :{TOWN} Road Vehicle Depot

src/lang/english_AU.txt

@@ -4387,6 +4387,11 @@ STR_BASESOUNDS_NONE_DESCRIPTION                                 :A sound pack wi
 STR_BASEMUSIC_WIN_DESCRIPTION                                   :Original Transport Tycoon Deluxe Windows edition music.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :A music pack without actual music.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Train {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Road Vehicle {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Ship {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Aircraft {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Tall office block

src/lang/english_US.txt

@@ -4629,6 +4629,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Original Transp
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Original Transport Tycoon (Original/World Editor) DOS edition music.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :A music pack without actual music.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Train {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Road Vehicle {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Ship {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Aircraft {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Tall office block

src/lang/esperanto.txt

@@ -3805,6 +3805,11 @@ STR_DESKTOP_SHORTCUT_COMMENT                                    :Al simulado lud
 
 # Translatable descriptions in media/baseset/*.ob* files
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Trajno {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Stratveturilo {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Ŝipo {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Aviadilo {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Vasta oficejaro

src/lang/estonian.txt

@@ -4552,6 +4552,11 @@ STR_BASEMUSIC_WIN_DESCRIPTION                                   :Algse Transport
 STR_BASEMUSIC_DOS_DESCRIPTION                                   :Algse Transport Tycoon Deluxe DOSi versiooni muusika.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Muusikakogu ilma muusikata.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Rong {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Mootorsõiduk {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Laev {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Õhusõiduk {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Kõrge büroohoone

src/lang/faroese.txt

@@ -3947,6 +3947,11 @@ STR_DESKTOP_SHORTCUT_COMMENT                                    :Eitt eftirgerð
 
 # Translatable descriptions in media/baseset/*.ob* files
 
+STR_TRADITIONAL_TRAIN_NAME                                      :{G=n}Tok {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :{G=n}Akfar {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :{G=n}Skip {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :{G=n}Flogfar {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Høgur skrivstovu bygningur

src/lang/finnish.txt

@@ -4650,6 +4650,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Alkuperäinen T
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Alkuperäinen Transport Tycoonin (alkuperäinen / World Editor) DOS-version musiikki.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Musiikkipaketti, jossa ei ole musiikkia.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Juna {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Ajoneuvo {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Laiva {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Ilma-alus {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Korkea toimistorakennus

src/lang/french.txt

@@ -4651,6 +4651,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Musiques origin
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Musiques originales de Transport Tycoon (version Originale/World Editor).
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Un pack de musiques sans musiques.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Train {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Véhicule routier {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Navire {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Aéronef {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Grand immeuble de bureaux

src/lang/gaelic.txt

@@ -4735,6 +4735,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Ceòl aig an de
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Ceòl aig an deasachadh DOS tùsail aig Transport Tycoon Deluxe (Original/World Editor).
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Pacaid ciùil anns nach eil fonn sam bith.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :{G=f}Trèan {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Carbad-rathaid {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :{G=f}Long {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Carbad-adhair {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :{G=m}Ionad oifisean àrd

src/lang/galician.txt

@@ -4622,6 +4622,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Música da edic
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Temazos orixinais da edición DOS de Transport Tycoon.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Un conxunto de músicas sen ningunha música.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Tren {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Vehículo de estrada {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Barco {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Aeronave {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Bloque alto de oficinas

src/lang/german.txt

@@ -5735,6 +5735,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Original Transp
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Original Transport Tycoon (Original/World Editor) DOS edition music.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Ein Musikset ohne Musik.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Zug {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Straßenfahrzeug {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Schiff {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Flugzeug {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Hohes Geschäftshaus

src/lang/greek.txt

@@ -4686,6 +4686,15 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Αρχική μ
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Αρχική μουσική από το Transport Tycoon (Αρχικός Επεξεργαστής Κόσμου) έκδοση DOS.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Ένα πάκετο μουσικής χωρίς πραγματική μουσική.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :{G=n}Τρένο {COMMA}
+STR_TRADITIONAL_TRAIN_NAME.geniki                               :Τρένου {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :{G=n}Όχημα Δρόμου {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME.geniki                        :Οχήματος Δρόμου {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :{G=n}Πλοίο {COMMA}
+STR_TRADITIONAL_SHIP_NAME.geniki                                :Πλοίου {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :{G=n}Αεροσκάφος {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME.geniki                            :Αεροσκάφους {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Ψηλό συγκρότημα γραφείων

src/lang/hebrew.txt

@@ -4514,6 +4514,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :מנגינות
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :מנגינות Transport Tycoon Deluxe (Original/World Editor) המקורי בגרסת DOS.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :אוסף מנגינות ללא מנגינות.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :רכבת {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :רכב {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :כלי שייט {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :כלי טייס {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :בניין משרדים גבוה

src/lang/hungarian.txt

@@ -4706,6 +4706,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Az eredeti Tran
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Az eredeti Transport Tycoon (az első változat és a World Editor) DOS verziójának zenéje.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Zenei alapcsomag zene nélkül.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Vonat {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Közúti jármű {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Hajó {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Repülő {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Magas irodaház

src/lang/icelandic.txt

@@ -4197,6 +4197,11 @@ STR_BASESOUNDS_NONE_DESCRIPTION                                 :Hljóðpakki á
 STR_BASEMUSIC_WIN_DESCRIPTION                                   :Upprunalega tónlistin úr Transport Tycoon Deluxe Windows útgáfunni.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Tónlistarpakki sem er í raun án tónlistar.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Lest {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Bifreið {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Skip {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Flugvél {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Há skrifstofubygging

src/lang/indonesian.txt

@@ -4642,6 +4642,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Musik orisinil
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Musik orisinil Transport Tycoon (Orisinil/Editor Dunia) versi DOS.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Paket musik tanpa musik sungguhan.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Kereta {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Kendaraan Jalan Raya {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Kapal {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Pesawat {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Gedung perkantoran tinggi

src/lang/irish.txt

@@ -4438,6 +4438,11 @@ STR_BASESOUNDS_NONE_DESCRIPTION                                 :Pacáiste fuaim
 STR_BASEMUSIC_WIN_DESCRIPTION                                   :Ceol bunaidh Transport Tycoon Deluxe, eagrán Windows.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Pacáiste ceoil gan aon cheol iarbhír ann.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Traein {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Feithicil Bóthair {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Long {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Aerárthach {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Bloc oifigí ard

src/lang/italian.txt

@@ -4672,6 +4672,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Musica original
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Musica originale di Transport Tycoon (edizione Original/World).
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Un pacchetto musicale non contenente alcuna musica.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Treno {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Automezzo {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Nave {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Aeromobile {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Grattacielo di uffici

src/lang/japanese.txt

@@ -4548,6 +4548,11 @@ STR_BASESOUNDS_NONE_DESCRIPTION                                 :空の効果音
 STR_BASEMUSIC_WIN_DESCRIPTION                                   :Transport Tycoon Deluxe オリジナル版 音楽 (Windows)
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :空の音楽パック
 
+STR_TRADITIONAL_TRAIN_NAME                                      :列車{COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :車両{COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :船舶{COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :航空機{COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :超高層ビル

src/lang/korean.txt

@@ -5734,6 +5734,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :오리지널
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :오리지널 트랜스포트 타이쿤 (오리지널/월드 에디터) DOS 에디션의 음악입니다.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :실제 음악이 없는 음악 팩입니다.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :열차 {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :차량 {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :선박 {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :항공기 {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :고층 사무 구획

src/lang/latin.txt

@@ -4734,6 +4734,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Musica ex editi
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Musica ex editione originale Transport Tycoon (Originale/World Editor) DOS.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Sarcina musicae sine ulla musica.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Tramen {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Vehiculum Viarium {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Navis {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Aeroplanum {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Altum multizonium officinarum

src/lang/latvian.txt

@@ -4653,6 +4653,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Oriģinālā Tr
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Oriģinālā Transport Tycoon (Original/World Editor) DOS laidiena mūzika.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Mūzikas kopa bez mūzikas
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Vilciens {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Autotransporta līdzeklis {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Kuģis {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Lidaparāts {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Biroju augstceltne

src/lang/lithuanian.txt

@@ -4755,6 +4755,11 @@ STR_BASESOUNDS_NONE_DESCRIPTION                                 :Garsų pakas be
 STR_BASEMUSIC_WIN_DESCRIPTION                                   :Originali Transport Tycoon Deluxe Windows leidimo muzika.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Muzikos pakas be muzikos.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Traukinys {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Automobilis {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Laivas {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Lėktuvas {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Administracinis kompleksas

src/lang/luxembourgish.txt

@@ -4641,6 +4641,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Original Transp
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Original Transport Tycoon (Original/World Editor) DOS Editioun-Musik.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :E Musikpack ouni aktuell Musik.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Zuch {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Stroossegefier {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Schëff {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Fliger {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Héije Büroblock

src/lang/malay.txt

@@ -4112,6 +4112,11 @@ STR_BASEMUSIC_WIN_DESCRIPTION                                   :Muzik asal Tran
 STR_BASEMUSIC_DOS_DESCRIPTION                                   :Muzik asal Transport Tycoon Deluxe edisi DOS
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Pek muzik tanpa muzik sebenar.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Keretapi {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Kenderaan {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Kapal {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Pesawat {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Bangunan pejabat tinggi

src/lang/norwegian_bokmal.txt

@@ -4644,6 +4644,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Original Transp
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Original Transport Tycoon (Original/World Editor) DOS edition music.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :En musikkpakke uten noe musikk.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Tog {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Kjøretøy {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Skip {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Luftfartøy {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Høyhus

src/lang/norwegian_nynorsk.txt

@@ -4355,6 +4355,11 @@ STR_BASESOUNDS_NONE_DESCRIPTION                                 :Ei lydpakke uta
 STR_BASEMUSIC_WIN_DESCRIPTION                                   :Original musikk frå Transport Tycoon Deluxe for Windows.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Ei musikkpakke utan noko musikk.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Tog {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Køyretøy {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Skip {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Luftfartøy {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Høghus

src/lang/polish.txt

@@ -5028,6 +5028,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Oryginalna edyc
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Oryginalna edycja utworów muzycznych dla Transport Tycoon DOS.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Zestaw utworów muzycznych nie zawierający żadnej muzyki.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Pociąg {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Pojazd {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Statek {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Samolot {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Wysoki biurowiec

src/lang/portuguese.txt

@@ -4605,6 +4605,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Música origina
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Música original da edição DOS de Transport Tycoon (Original/Editor de Mundo)
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Um conjunto de música vazio.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Comboio {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Veículo Rodoviário {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Navio {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Aeronave {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Edifício alto de escritórios

src/lang/romanian.txt

@@ -4454,6 +4454,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Setul de muzic
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Setul de muzică original al Transport (Original/World Editor) pentru DOS.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Un set de muzică fără muzică inclusă.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Trenul {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Autovehiculul {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Nava {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Aeronava {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Clădire înaltă de birouri

src/lang/russian.txt

@@ -4853,6 +4853,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Набор му
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Набор музыкального оформления из игры Transport Tycoon Deluxe для DOS.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :"Пустой" набор музыкального оформления, не содержащий никакой музыки.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Поезд №{COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Автомобиль №{COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Судно №{COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Борт №{COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Высотное офисное здание

src/lang/serbian.txt

@@ -4682,6 +4682,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Originalna muzi
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Originalna muzika TTD (Original / World Editor) DOS izdanja.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Prazan skup muzičkih numera.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Voz {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Drumsko Vozilo {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Brod {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Letilica {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Visoka radionica

src/lang/simplified_chinese.txt

@@ -4642,6 +4642,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :运输大亨DOS
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :原版运输大亨（DOS版及地图编辑器扩展）音乐。
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :一个没有实际内容的音乐包.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :列车 {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :汽车 {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :船只 {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :飞机 {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :高层写字楼

src/lang/slovak.txt

@@ -4713,6 +4713,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Pôvodná hudba
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Pôvodná hudba z Transport Tycoon (DOS).
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Sada hudby neobsahujúca hudbu.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :{G=m}Vlak {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :{G=s}Cestné vozidlo {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :{G=z}Loď {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :{G=s}Lietadlo {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :{G=z}Vysoká kancelárska budova

src/lang/slovenian.txt

@@ -4597,6 +4597,11 @@ STR_BASEMUSIC_WIN_DESCRIPTION                                   :Originalna glas
 STR_BASEMUSIC_DOS_DESCRIPTION                                   :Originalna glasba Transport Tycoon Deluxe DOS različice
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Glasbeni paket z vključeno glasbo.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Vlak {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Cestno vozilo {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Ladja {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Letalo {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Visok pisarniški blok

src/lang/spanish.txt

@@ -4643,6 +4643,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Música origina
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Música original de Transport Tycoon (Original/Editor de Mundos), versión DOS.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Un conjunto de música vacío.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Tren {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Vehículo de carretera {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Barco {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Aeronave {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Bloque alto de oficinas

src/lang/spanish_MX.txt

@@ -4643,6 +4643,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Música origina
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Música original de Transport Tycoon versión World Editor para DOS.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Paquete de música vacío
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Tren {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Vehículo de carretera {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Barco {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Aeronave {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Edificio alto de oficinas

src/lang/swedish.txt

@@ -4642,6 +4642,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Originalmusiken
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Originalmusiken från DOS-utgåvan av Transport Tycoon (Original/World Editor).
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Ett musikpaket utan någon musik.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Tåg {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Vägfordon {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Skepp {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Luftfarkost {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Högt kontor

src/lang/tamil.txt

@@ -4186,6 +4186,11 @@ STR_BASEMUSIC_WIN_DESCRIPTION                                   :அசல்
 STR_BASEMUSIC_DOS_DESCRIPTION                                   :அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் DOS பதிப்பு இசை.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :இசை இல்லாத இசைத்தொகுப்பு.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :இரயில் {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :சாலை வாகனம் {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :கப்பல் {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :விமானம் {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :உயரமான அலுவலுக கட்டம்

src/lang/thai.txt

@@ -4349,6 +4349,11 @@ STR_BASESOUNDS_NONE_DESCRIPTION                                 :ชุดเส
 STR_BASEMUSIC_WIN_DESCRIPTION                                   :เพลงต้นตำหรับชอง Transport Tycoon Deluxe Windows edition
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :ชุดเพลงประกอบแบบไม่มีเสียงเพลง
 
+STR_TRADITIONAL_TRAIN_NAME                                      :รถไฟ {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :พาหนะทางบก {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :พาหนะทางน้ำ {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :อากาศยาน {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :ตึกสูง

src/lang/traditional_chinese.txt

@@ -4445,6 +4445,11 @@ STR_BASESOUNDS_NONE_DESCRIPTION                                 :不含任何音
 STR_BASEMUSIC_WIN_DESCRIPTION                                   :原版 Transport Tycoon Deluxe Windows 版的音樂。
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :不含任何音樂的音樂集。
 
+STR_TRADITIONAL_TRAIN_NAME                                      :列車 {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :車輛 {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :船舶 {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :飛機 {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :摩天辦公大樓

src/lang/turkish.txt

@@ -4643,6 +4643,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Özgün Transpo
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Özgün Transport Tycoon Deluxe (Original/World Editor) DOS sürümü müzikleri.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Müzik içermeyen boş bir müzik paketi.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Tren {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Karayolu Aracı {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Gemi {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Uçak {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Yüksek ofis binasi

src/lang/ukrainian.txt

@@ -4773,6 +4773,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Оригіна
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Оригінальна музика Transport Tycoon Deluxe(DOS)
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Порожній набір музики.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Поїзд №{COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Автотранспорт №{COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Судно №{COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Борт №{COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Великий офіс

src/lang/unfinished/frisian.txt

@@ -3993,6 +3993,11 @@ STR_BASESOUNDS_NONE_DESCRIPTION                                 :In lûdspakket
 STR_BASEMUSIC_WIN_DESCRIPTION                                   :Orizjinele musyk fan de Transport Tycoon Deluxe Windows-edysje.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :In musykpakket sûnder wiere musyk.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Trein {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Lânfartúg {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Skip {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Fleantúg {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Heech kantoargebou

src/lang/unfinished/maltese.txt

@@ -1152,6 +1152,11 @@ STR_DESKTOP_SHORTCUT_COMMENT                                    :Logħba simulaz
 
 # Translatable descriptions in media/baseset/*.ob* files
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Ferrovija {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Vettura tat-triq {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Vapur {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Ajruplan {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_FOUNTAIN_1                               :Funtana

src/lang/unfinished/marathi.txt

@@ -1602,6 +1602,11 @@ STR_ERROR_BRIDGE_THROUGH_MAP_BORDER                             :{WHITE}पू
 
 # Translatable descriptions in media/baseset/*.ob* files
 
+STR_TRADITIONAL_TRAIN_NAME                                      :रेल्वे {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :रस्त्यावरील वाहन {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :जहाज {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :विमान {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_HOTEL_1                                  :हॉटेल

src/lang/unfinished/persian.txt

@@ -3600,6 +3600,11 @@ STR_BASESOUNDS_NONE_DESCRIPTION                                 :یک بسته
 STR_BASEMUSIC_WIN_DESCRIPTION                                   :موزیک اصلی بازی ترانسپورت تایکون نسخه ویندوز
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :یک بسته موسیقی که حاوی هیچ موزیکی نیست
 
+STR_TRADITIONAL_TRAIN_NAME                                      :قطار {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :خودرو جاده ای {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :کشتی {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :هواپیما {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :ساختمان اداری بلند

src/lang/vietnamese.txt

@@ -4642,6 +4642,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Nhạc của ng
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Nhạc của nguyên bản Transport Tycoon (Original/World Editor) cho DOS.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Gói âm nhạc này không có nhạc nào.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Đoàn tàu {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Ôtô {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Tàu thuỷ {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Máy bay {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Cao ốc văn phòng

src/lang/welsh.txt

@@ -4477,6 +4477,11 @@ STR_BASEMUSIC_DOS_DESCRIPTION                                   :Cerddoriaeth gw
 STR_BASEMUSIC_TTO_DESCRIPTION                                   :Cerddoriaeth gwreiddiol fersion DOS o Transport Tycoon Deluxe (Gwreiddiol/Golygydd Byd).
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Pecyn cerddoriaeth heb unrhyw gerddoriaeth ynddo.
 
+STR_TRADITIONAL_TRAIN_NAME                                      :Trên {COMMA}
+STR_TRADITIONAL_ROAD_VEHICLE_NAME                               :Cerbyd Ffordd {COMMA}
+STR_TRADITIONAL_SHIP_NAME                                       :Llong {COMMA}
+STR_TRADITIONAL_AIRCRAFT_NAME                                   :Awyren {COMMA}
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Bloc swyddfa uchel

src/settings_gui.cpp

@@ -1735,6 +1735,7 @@ static SettingsContainer &GetSettingsTree()
 			interface->Add(new SettingEntry("gui.adv_sig_bridge_tun_modes"));
 			interface->Add(new SettingEntry("gui.show_depot_sell_gui"));
 			interface->Add(new SettingEntry("gui.open_vehicle_gui_clone_share"));
+			interface->Add(new SettingEntry("gui.vehicle_names"));
 		}
 
 		SettingsPage *advisors = main->Add(new SettingsPage(STR_CONFIG_SETTING_ADVISORS));

src/settings_type.h

@@ -206,6 +206,7 @@ struct GUISettings : public TimeSettings {
 	bool   open_vehicle_gui_clone_share;     ///< Open vehicle GUI when share-cloning vehicle from depot GUI
 	uint8  linkgraph_colours;                ///< linkgraph overlay colours
 	bool   disable_vehicle_image_update;     ///< Disable NewGRFs from continuously updating vehicle images
+	uint8  vehicle_names;                    ///< Vehicle naming scheme
 
 	uint16 console_backlog_timeout;          ///< the minimum amount of time items should be in the console backlog before they will be removed in ~3 seconds granularity.
 	uint16 console_backlog_length;           ///< the minimum amount of items in the console backlog before items will be removed.

src/strings.cpp

@@ -1758,22 +1758,26 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
 					int64 args_array[] = {(int64)(size_t)v->name.c_str()};
 					StringParameters tmp_params(args_array);
 					buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
-				} else if (v->group_id != DEFAULT_GROUP) {
+				} else if (v->group_id != DEFAULT_GROUP && _settings_client.gui.vehicle_names != 0 && v->type < VEH_COMPANY_END) {
 					/* The vehicle has no name, but is member of a group, so print group name */
+					if (_settings_client.gui.vehicle_names == 1) {
 						int64 args_array[] = {v->group_id, v->unitnumber};
 						StringParameters tmp_params(args_array);
 						buff = GetStringWithArgs(buff, STR_FORMAT_GROUP_VEHICLE_NAME, &tmp_params, last);
+					} else {
+						int64 args_array[] = {v->group_id, STR_TRADITIONAL_TRAIN_NAME + v->type, v->unitnumber};
+						StringParameters tmp_params(args_array);
+						buff = GetStringWithArgs(buff, STR_FORMAT_GROUP_VEHICLE_NAME_LONG, &tmp_params, last);
+					}
 				} else {
 					int64 args_array[] = {v->unitnumber};
 					StringParameters tmp_params(args_array);
 
 					StringID str;
-					switch (v->type) {
+					if (v->type < VEH_COMPANY_END) {
-						default:           str = STR_INVALID_VEHICLE; break;
+						str = ((_settings_client.gui.vehicle_names == 1) ? STR_SV_TRAIN_NAME : STR_TRADITIONAL_TRAIN_NAME) + v->type;
-						case VEH_TRAIN:    str = STR_SV_TRAIN_NAME; break;
+					} else {
-						case VEH_ROAD:     str = STR_SV_ROAD_VEHICLE_NAME; break;
+						str = STR_INVALID_VEHICLE;
-						case VEH_SHIP:     str = STR_SV_SHIP_NAME; break;
-						case VEH_AIRCRAFT: str = STR_SV_AIRCRAFT_NAME; break;
 					}
 
 					buff = GetStringWithArgs(buff, str, &tmp_params, last);

src/table/settings.ini

@@ -5072,6 +5072,20 @@ strhelp  = STR_CONFIG_SETTING_DISABLE_VEHICLE_IMAGE_UPDATE_HELPTEXT
 proc     = InvalidateAllVehicleImageCaches
 cat      = SC_EXPERT
 
+[SDTC_VAR]
+var      = gui.vehicle_names
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 1
+min      = 0
+max      = 2
+str      = STR_CONFIG_SETTING_VEHICLE_NAMES
+strhelp  = STR_CONFIG_SETTING_VEHICLE_NAMES_HELPTEXT
+strval   = STR_CONFIG_SETTING_VEHICLE_NAMES_TRADITIONAL
+proc     = RedrawScreen
+cat      = SC_BASIC
+
 ; For the dedicated build we'll enable dates in logs by default.
 [SDTC_BOOL]
 ifdef    = DEDICATED