(svn r19329) -Codechange: language updates for the previous commits

46 files changed, 630 insertions, 645 deletions

diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt
index f825eb50f..647860c4b 100644
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -2016,20 +2016,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Bou lugh
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Lughawe Keuse
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Kies groote/tipe van lughawe
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Klein
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Dorp
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Metropolitaanse
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Internasionaal
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Pendelaar
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Tussenkontinentaal
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Helihawe
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helidepot
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Helistasie
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Klein lughawe
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Groot Lughawe
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Naaf lughawe
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helikopter lughawe
+STR_AIRPORT_SMALL                                               :Klein
+STR_AIRPORT_CITY                                                :Dorp
+STR_AIRPORT_METRO                                               :Metropolitaanse
+STR_AIRPORT_INTERNATIONAL                                       :Internasionaal
+STR_AIRPORT_COMMUTER                                            :Pendelaar
+STR_AIRPORT_INTERCONTINENTAL                                    :Tussenkontinentaal
+STR_AIRPORT_HELIPORT                                            :Helihawe
+STR_AIRPORT_HELIDEPOT                                           :Helidepot
+STR_AIRPORT_HELISTATION                                         :Helistasie
+
+STR_AIRPORT_CLASS_SMALL                                         :Klein lughawe
+STR_AIRPORT_CLASS_LARGE                                         :Groot Lughawe
+STR_AIRPORT_CLASS_HUB                                           :Naaf lughawe
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helikopter lughawe
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Geraas gegenereer: {GOLD}{COMMA}
 
diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt
index 5b7233bfd..17b190d22 100644
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -2015,20 +2015,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}بناء
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}اختر المطار
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}اختر حجم / نوع المطار
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}صغير
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}مدينة
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}مطار متروبوليتان
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}مطار دولي
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}مطار محلي
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}مطار قاري
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}مهبط طائرة عمودية
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}حظيرة طائرة عمودية
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}محطة طيران عمودي
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}مطار صغير
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}مطارات كبيرة
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}محور مطارات
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}مطار طيران عمودي
+STR_AIRPORT_SMALL                                               :صغير
+STR_AIRPORT_CITY                                                :مدينة
+STR_AIRPORT_METRO                                               :مطار متروبوليتان
+STR_AIRPORT_INTERNATIONAL                                       :مطار دولي
+STR_AIRPORT_COMMUTER                                            :مطار محلي
+STR_AIRPORT_INTERCONTINENTAL                                    :مطار قاري
+STR_AIRPORT_HELIPORT                                            :مهبط طائرة عمودية
+STR_AIRPORT_HELIDEPOT                                           :حظيرة طائرة عمودية
+STR_AIRPORT_HELISTATION                                         :محطة طيران عمودي
+
+STR_AIRPORT_CLASS_SMALL                                         :مطار صغير
+STR_AIRPORT_CLASS_LARGE                                         :مطارات كبيرة
+STR_AIRPORT_CLASS_HUB                                           :محور مطارات
+STR_AIRPORT_CLASS_HELIPORTS                                     :مطار طيران عمودي
 
 STR_STATION_BUILD_NOISE                                         :{BLACK} الضوضاء المتولدة: {GOLD}{COMMA}
 
diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index 5980c0d88..456e74e9f 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -2016,20 +2016,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Construi
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Seleção de Aeroporto
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Selecionar tamanho/tipo de aeroporto
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Pequeno
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Cidade
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Metropolitano
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Internacional
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Viajante
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Intercontinental
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Heliporto
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Deposito de helicópteros
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Heli-estação
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Aeroportos pequenos
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Aeroportos grandes
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Aeroportos modulares
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Heliportos
+STR_AIRPORT_SMALL                                               :Pequeno
+STR_AIRPORT_CITY                                                :Cidade
+STR_AIRPORT_METRO                                               :Metropolitano
+STR_AIRPORT_INTERNATIONAL                                       :Internacional
+STR_AIRPORT_COMMUTER                                            :Viajante
+STR_AIRPORT_INTERCONTINENTAL                                    :Intercontinental
+STR_AIRPORT_HELIPORT                                            :Heliporto
+STR_AIRPORT_HELIDEPOT                                           :Deposito de helicópteros
+STR_AIRPORT_HELISTATION                                         :Heli-estação
+
+STR_AIRPORT_CLASS_SMALL                                         :Aeroportos pequenos
+STR_AIRPORT_CLASS_LARGE                                         :Aeroportos grandes
+STR_AIRPORT_CLASS_HUB                                           :Aeroportos modulares
+STR_AIRPORT_CLASS_HELIPORTS                                     :Heliportos
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Ruído gerado: {GOLD}{COMMA}
 
diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt
index bfa71274d..bd2078d62 100644
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -2009,20 +2009,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Стро
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Избор на летище
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Големина/тип на летището
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Малко
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Град
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Метрополисно
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Международно
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Комютър
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Междуконтинентално
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Хеликоптерна площадка
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Хеликоптерен хангар
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Хеликоптерна станция
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Малки летища
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Голямо летище
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Централни летища
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Хеликоптерни самолети
+STR_AIRPORT_SMALL                                               :Малко
+STR_AIRPORT_CITY                                                :Град
+STR_AIRPORT_METRO                                               :Метрополисно
+STR_AIRPORT_INTERNATIONAL                                       :Международно
+STR_AIRPORT_COMMUTER                                            :Комютър
+STR_AIRPORT_INTERCONTINENTAL                                    :Междуконтинентално
+STR_AIRPORT_HELIPORT                                            :Хеликоптерна площадка
+STR_AIRPORT_HELIDEPOT                                           :Хеликоптерен хангар
+STR_AIRPORT_HELISTATION                                         :Хеликоптерна станция
+
+STR_AIRPORT_CLASS_SMALL                                         :Малки летища
+STR_AIRPORT_CLASS_LARGE                                         :Голямо летище
+STR_AIRPORT_CLASS_HUB                                           :Централни летища
+STR_AIRPORT_CLASS_HELIPORTS                                     :Хеликоптерни самолети
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Произведен шум: {GOLD}{COMMA}
 
diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index 6c0c87c7d..a6ee983c6 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -2016,20 +2016,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Construe
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Aeroports
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Selecciona mida/tipus d'aeroport
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Petit
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}de Ciutat
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Metropolità
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Internacional
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Regional
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Intercontinental
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Heliport
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helihangar
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Heliestació
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Aeroports petits
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Aeroports grans
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Aeroports d'enllaç
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Aeroports d'helicòpters
+STR_AIRPORT_SMALL                                               :Petit
+STR_AIRPORT_CITY                                                :de Ciutat
+STR_AIRPORT_METRO                                               :Metropolità
+STR_AIRPORT_INTERNATIONAL                                       :Internacional
+STR_AIRPORT_COMMUTER                                            :Regional
+STR_AIRPORT_INTERCONTINENTAL                                    :Intercontinental
+STR_AIRPORT_HELIPORT                                            :Heliport
+STR_AIRPORT_HELIDEPOT                                           :Helihangar
+STR_AIRPORT_HELISTATION                                         :Heliestació
+
+STR_AIRPORT_CLASS_SMALL                                         :Aeroports petits
+STR_AIRPORT_CLASS_LARGE                                         :Aeroports grans
+STR_AIRPORT_CLASS_HUB                                           :Aeroports d'enllaç
+STR_AIRPORT_CLASS_HELIPORTS                                     :Aeroports d'helicòpters
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Soroll generat: {GOLD}{COMMA}
 
diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt
index 747eb3229..f99cd72e1 100644
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -2111,20 +2111,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Izgradi
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Izbor zračne luke
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Odaberi veličinu/vrstu zračne luke
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Mala
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Grad
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Metropolitanska zračna luka
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Međunarodna zračna luka
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Redoviti putnik
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Međukontinentalni
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Heliodrom
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Spremište helikoptera
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Postaja za helikoptere
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Male zračne luke
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Velike zračne luke
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Središnje zračne luke
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helicopterske zračne luke
+STR_AIRPORT_SMALL                                               :Mala
+STR_AIRPORT_CITY                                                :Grad
+STR_AIRPORT_METRO                                               :Metropolitanska zračna luka
+STR_AIRPORT_INTERNATIONAL                                       :Međunarodna zračna luka
+STR_AIRPORT_COMMUTER                                            :Redoviti putnik
+STR_AIRPORT_INTERCONTINENTAL                                    :Međukontinentalni
+STR_AIRPORT_HELIPORT                                            :Heliodrom
+STR_AIRPORT_HELIDEPOT                                           :Spremište helikoptera
+STR_AIRPORT_HELISTATION                                         :Postaja za helikoptere
+
+STR_AIRPORT_CLASS_SMALL                                         :Male zračne luke
+STR_AIRPORT_CLASS_LARGE                                         :Velike zračne luke
+STR_AIRPORT_CLASS_HUB                                           :Središnje zračne luke
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helicopterske zračne luke
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Proizvedeno buke: {GOLD}{COMMA}
 
diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index c65cf2854..7d54f52c9 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -2083,20 +2083,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Postavit
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Výběr letiště
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Zvol velikost a typ letiště
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Malé
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Městské
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Metropolitní
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Mezinárodní
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Příměstské
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Mezikontinentální
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Klasické
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Servisní
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Stanice
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Malá letiště
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Velká letiště
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Hlavní letiště
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Letiště pro vrtulníky
+STR_AIRPORT_SMALL                                               :Malé
+STR_AIRPORT_CITY                                                :Městské
+STR_AIRPORT_METRO                                               :Metropolitní
+STR_AIRPORT_INTERNATIONAL                                       :Mezinárodní
+STR_AIRPORT_COMMUTER                                            :Příměstské
+STR_AIRPORT_INTERCONTINENTAL                                    :Mezikontinentální
+STR_AIRPORT_HELIPORT                                            :Klasické
+STR_AIRPORT_HELIDEPOT                                           :Servisní
+STR_AIRPORT_HELISTATION                                         :Stanice
+
+STR_AIRPORT_CLASS_SMALL                                         :Malá letiště
+STR_AIRPORT_CLASS_LARGE                                         :Velká letiště
+STR_AIRPORT_CLASS_HUB                                           :Hlavní letiště
+STR_AIRPORT_CLASS_HELIPORTS                                     :Letiště pro vrtulníky
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Vytvářený hluk: {GOLD}{COMMA}
 
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index 814b87d2f..1af144be1 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -2015,20 +2015,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Byg en l
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Valg af lufthavn
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Vælg lufthavnens størrelse/type
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Lille
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}By
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Metropollufthavn
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}International lufthavn
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Pendler
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Interkontinental
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Helikopterlandingsplads
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helikopterværksted
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Helikopterplads
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Små lufthavne
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Store lufthavne
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Central lufthavn
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helikopterlufthavn
+STR_AIRPORT_SMALL                                               :Lille
+STR_AIRPORT_CITY                                                :By
+STR_AIRPORT_METRO                                               :Metropollufthavn
+STR_AIRPORT_INTERNATIONAL                                       :International lufthavn
+STR_AIRPORT_COMMUTER                                            :Pendler
+STR_AIRPORT_INTERCONTINENTAL                                    :Interkontinental
+STR_AIRPORT_HELIPORT                                            :Helikopterlandingsplads
+STR_AIRPORT_HELIDEPOT                                           :Helikopterværksted
+STR_AIRPORT_HELISTATION                                         :Helikopterplads
+
+STR_AIRPORT_CLASS_SMALL                                         :Små lufthavne
+STR_AIRPORT_CLASS_LARGE                                         :Store lufthavne
+STR_AIRPORT_CLASS_HUB                                           :Central lufthavn
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helikopterlufthavn
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Genereret støj: {GOLD}{COMMA}
 
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index bffd54e49..3a8a22b1e 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -2015,20 +2015,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Bouw vli
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Keuze van vliegveld
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Kies grootte en type van vliegveld
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Klein
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Stad
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Hoofdstedelijk
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Internationaal vliegveld
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Pendel
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Intercontinentaal
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Heliport
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helihangar
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Helikopterstation
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Kleine vliegvelden
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Grote vliegvelden
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Centraal vliegveld
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helikopter-vliegvelden
+STR_AIRPORT_SMALL                                               :Klein
+STR_AIRPORT_CITY                                                :Stad
+STR_AIRPORT_METRO                                               :Hoofdstedelijk
+STR_AIRPORT_INTERNATIONAL                                       :Internationaal vliegveld
+STR_AIRPORT_COMMUTER                                            :Pendel
+STR_AIRPORT_INTERCONTINENTAL                                    :Intercontinentaal
+STR_AIRPORT_HELIPORT                                            :Heliport
+STR_AIRPORT_HELIDEPOT                                           :Helihangar
+STR_AIRPORT_HELISTATION                                         :Helikopterstation
+
+STR_AIRPORT_CLASS_SMALL                                         :Kleine vliegvelden
+STR_AIRPORT_CLASS_LARGE                                         :Grote vliegvelden
+STR_AIRPORT_CLASS_HUB                                           :Centraal vliegveld
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helikopter-vliegvelden
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Geluidsoverlast: {GOLD}{COMMA}
 
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 6641c18f3..214af8f9e 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -2016,21 +2016,6 @@ STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Airport
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Select size/type of airport
 STR_STATION_BUILD_AIRPORT_CLASS_LABEL                           :{BLACK}Airport class
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Small
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}City
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Metropolitan
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}International
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Commuter
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Intercontinental
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Heliport
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helidepot
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Helistation
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Small airports
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Large airports
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Hub airports
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helicopter airports
-
 STR_AIRPORT_SMALL                                               :Small
 STR_AIRPORT_CITY                                                :City
 STR_AIRPORT_METRO                                               :Metropolitan
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt
index 446c45b7b..1de9e4f2b 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -2015,20 +2015,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Build ai
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Airport Selection
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Select size/type of airport
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Small
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}City
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Metropolitan
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}International
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Commuter
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Intercontinental
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Heliport
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helidepot
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Helistation
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Small airports
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Large airports
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Hub airports
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helicopter airports
+STR_AIRPORT_SMALL                                               :Small
+STR_AIRPORT_CITY                                                :City
+STR_AIRPORT_METRO                                               :Metropolitan
+STR_AIRPORT_INTERNATIONAL                                       :International
+STR_AIRPORT_COMMUTER                                            :Commuter
+STR_AIRPORT_INTERCONTINENTAL                                    :Intercontinental
+STR_AIRPORT_HELIPORT                                            :Heliport
+STR_AIRPORT_HELIDEPOT                                           :Helidepot
+STR_AIRPORT_HELISTATION                                         :Helistation
+
+STR_AIRPORT_CLASS_SMALL                                         :Small airports
+STR_AIRPORT_CLASS_LARGE                                         :Large airports
+STR_AIRPORT_CLASS_HUB                                           :Hub airports
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helicopter airports
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Noise generated: {GOLD}{COMMA}
 
diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt
index 191c1f0f5..072167c3f 100644
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -1976,20 +1976,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Konstrui
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Elekto de Flughaveno
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Elektu grandecon/tipon de flughaveno
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Malgranda flughaveno
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Urba flughaveno
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Ĉefurba
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Internacia
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Urbeta flughaveno
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Interkontinenta
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Helikopterejo
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helikopterogaraĝo
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Helikopterstacio
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Malgrandaj flughavenoj
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Grandaj flughavenoj
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Nabaj flughavenoj
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helikopterhaveno
+STR_AIRPORT_SMALL                                               :Malgranda flughaveno
+STR_AIRPORT_CITY                                                :Urba flughaveno
+STR_AIRPORT_METRO                                               :Ĉefurba
+STR_AIRPORT_INTERNATIONAL                                       :Internacia
+STR_AIRPORT_COMMUTER                                            :Urbeta flughaveno
+STR_AIRPORT_INTERCONTINENTAL                                    :Interkontinenta
+STR_AIRPORT_HELIPORT                                            :Helikopterejo
+STR_AIRPORT_HELIDEPOT                                           :Helikopterogaraĝo
+STR_AIRPORT_HELISTATION                                         :Helikopterstacio
+
+STR_AIRPORT_CLASS_SMALL                                         :Malgrandaj flughavenoj
+STR_AIRPORT_CLASS_LARGE                                         :Grandaj flughavenoj
+STR_AIRPORT_CLASS_HUB                                           :Nabaj flughavenoj
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helikopterhaveno
 
 
 # Landscaping toolbar
diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt
index 7be1d1f87..76e7e26fa 100644
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -2072,20 +2072,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Ehita le
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Lennuvälja valik
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Vali lennuvälja suurus ja tüüp
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Väike
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Linn
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Metropoli lennujaam
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Rahvusvaheline lennujaam
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Turisti
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Ülemaailmne lennuväli
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Kopteriväljak
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helikopteridepoo
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Helijaam
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Väikesed lennuväljad
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Suured lennuväljad
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Suured lennuväljad
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helikopteri lennuväljad
+STR_AIRPORT_SMALL                                               :Väike
+STR_AIRPORT_CITY                                                :Linn
+STR_AIRPORT_METRO                                               :Metropoli lennujaam
+STR_AIRPORT_INTERNATIONAL                                       :Rahvusvaheline lennujaam
+STR_AIRPORT_COMMUTER                                            :Turisti
+STR_AIRPORT_INTERCONTINENTAL                                    :Ülemaailmne lennuväli
+STR_AIRPORT_HELIPORT                                            :Kopteriväljak
+STR_AIRPORT_HELIDEPOT                                           :Helikopteridepoo
+STR_AIRPORT_HELISTATION                                         :Helijaam
+
+STR_AIRPORT_CLASS_SMALL                                         :Väikesed lennuväljad
+STR_AIRPORT_CLASS_LARGE                                         :Suured lennuväljad
+STR_AIRPORT_CLASS_HUB                                           :Suured lennuväljad
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helikopteri lennuväljad
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Tekitatud müra: {GOLD}{COMMA}
 
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index 3eb443cde..ab2e7a914 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -2015,20 +2015,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Rakenna
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Lentokentän valinta
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Valitse lentokentän koko ja tyyppi.
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Pieni
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Kaupunki
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Suurkaupungin
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Kansainvälinen
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Lähiliikenne
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Mannertenvälinen
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Helikopterikenttä
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helikopterihalli
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Helikopteriasema
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Pienet lentokentät
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Isot lentokentät
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Keskuslentokenttä
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helikopterikentät
+STR_AIRPORT_SMALL                                               :Pieni
+STR_AIRPORT_CITY                                                :Kaupunki
+STR_AIRPORT_METRO                                               :Suurkaupungin
+STR_AIRPORT_INTERNATIONAL                                       :Kansainvälinen
+STR_AIRPORT_COMMUTER                                            :Lähiliikenne
+STR_AIRPORT_INTERCONTINENTAL                                    :Mannertenvälinen
+STR_AIRPORT_HELIPORT                                            :Helikopterikenttä
+STR_AIRPORT_HELIDEPOT                                           :Helikopterihalli
+STR_AIRPORT_HELISTATION                                         :Helikopteriasema
+
+STR_AIRPORT_CLASS_SMALL                                         :Pienet lentokentät
+STR_AIRPORT_CLASS_LARGE                                         :Isot lentokentät
+STR_AIRPORT_CLASS_HUB                                           :Keskuslentokenttä
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helikopterikentät
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Aiheutettu melu: {GOLD}{COMMA}
 
diff --git a/src/lang/french.txt b/src/lang/french.txt
index e709b4277..d8796e83e 100644
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -2016,20 +2016,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Construi
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Choix de l'aéroport
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Choix du type & taille de l'aéroport
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Petit
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Urbain
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Métropolitain
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}International
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}de Banlieue
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Intercontinental
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Hélitour
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Hélidépôt
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Hélistation
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Petits aéroports
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Grands aéroports
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Aéroports Internationaux
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Héliports
+STR_AIRPORT_SMALL                                               :Petit
+STR_AIRPORT_CITY                                                :Urbain
+STR_AIRPORT_METRO                                               :Métropolitain
+STR_AIRPORT_INTERNATIONAL                                       :International
+STR_AIRPORT_COMMUTER                                            :de Banlieue
+STR_AIRPORT_INTERCONTINENTAL                                    :Intercontinental
+STR_AIRPORT_HELIPORT                                            :Hélitour
+STR_AIRPORT_HELIDEPOT                                           :Hélidépôt
+STR_AIRPORT_HELISTATION                                         :Hélistation
+
+STR_AIRPORT_CLASS_SMALL                                         :Petits aéroports
+STR_AIRPORT_CLASS_LARGE                                         :Grands aéroports
+STR_AIRPORT_CLASS_HUB                                           :Aéroports Internationaux
+STR_AIRPORT_CLASS_HELIPORTS                                     :Héliports
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Bruit généré{NBSP}: {GOLD}{COMMA}
 
diff --git a/src/lang/galician.txt b/src/lang/galician.txt
index a122db4d1..89e200993 100644
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -1969,20 +1969,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Constru�
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Selección do Aeroporto
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Selecciona o tamaño/tipo de aeroporto
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Pequeno
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Cidade
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Aeroporto metropolitano
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Aeroporto Internacional
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Conmutador
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Intercontinental
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Heliporto
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helidepósito
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Heliporto
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Aeroportos pequenos
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Aeroportos grandes
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Aeroportos centrais
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Aeroportos para helicópteros
+STR_AIRPORT_SMALL                                               :Pequeno
+STR_AIRPORT_CITY                                                :Cidade
+STR_AIRPORT_METRO                                               :Aeroporto metropolitano
+STR_AIRPORT_INTERNATIONAL                                       :Aeroporto Internacional
+STR_AIRPORT_COMMUTER                                            :Conmutador
+STR_AIRPORT_INTERCONTINENTAL                                    :Intercontinental
+STR_AIRPORT_HELIPORT                                            :Heliporto
+STR_AIRPORT_HELIDEPOT                                           :Helidepósito
+STR_AIRPORT_HELISTATION                                         :Heliporto
+
+STR_AIRPORT_CLASS_SMALL                                         :Aeroportos pequenos
+STR_AIRPORT_CLASS_LARGE                                         :Aeroportos grandes
+STR_AIRPORT_CLASS_HUB                                           :Aeroportos centrais
+STR_AIRPORT_CLASS_HELIPORTS                                     :Aeroportos para helicópteros
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Ruído xerado: {GOLD}{COMMA}
 
diff --git a/src/lang/german.txt b/src/lang/german.txt
index 8827a55e4..3cc794578 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -2016,20 +2016,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Flughafe
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Flughafen bauen
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Wähle die Größe/Art des Flughafens
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Klein
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Stadt
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Großraum
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}International
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Nahverkehr
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Interkontinental
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Hubschrauberlandeplatz
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Hubschrauberhalle
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Hubschrauberstation
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Kleine Flughäfen
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Große Flughäfen
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Luftfahrt-Drehkreuze
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Flughäfen für Hubschrauber
+STR_AIRPORT_SMALL                                               :Klein
+STR_AIRPORT_CITY                                                :Stadt
+STR_AIRPORT_METRO                                               :Großraum
+STR_AIRPORT_INTERNATIONAL                                       :International
+STR_AIRPORT_COMMUTER                                            :Nahverkehr
+STR_AIRPORT_INTERCONTINENTAL                                    :Interkontinental
+STR_AIRPORT_HELIPORT                                            :Hubschrauberlandeplatz
+STR_AIRPORT_HELIDEPOT                                           :Hubschrauberhalle
+STR_AIRPORT_HELISTATION                                         :Hubschrauberstation
+
+STR_AIRPORT_CLASS_SMALL                                         :Kleine Flughäfen
+STR_AIRPORT_CLASS_LARGE                                         :Große Flughäfen
+STR_AIRPORT_CLASS_HUB                                           :Luftfahrt-Drehkreuze
+STR_AIRPORT_CLASS_HELIPORTS                                     :Flughäfen für Hubschrauber
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Lärmbelastung: {GOLD}{COMMA}
 
diff --git a/src/lang/greek.txt b/src/lang/greek.txt
index d7577de31..6aa9cffa1 100644
--- a/src/lang/greek.txt
+++ b/src/lang/greek.txt
@@ -2110,20 +2110,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Κατα
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Επιλογή Αεροδρομίου
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Επιλογή μεγέθους/τύπου αεροδρομίου
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Μικρό
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Πόλης
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Μητροπολιτικό
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Διεθνές
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Ταξιδιωτικό
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Διηπειρωτικό
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Ελικοδρόμιο
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Υπόστεγο ελικοπτέρων
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Στάθμος ελικοπτέρων
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Μικρά αεροδρόμια
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Μεγάλα αεροδρόμια
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Κομβίκα αεροδρόμια
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Ελικοδρόμια
+STR_AIRPORT_SMALL                                               :Μικρό
+STR_AIRPORT_CITY                                                :Πόλης
+STR_AIRPORT_METRO                                               :Μητροπολιτικό
+STR_AIRPORT_INTERNATIONAL                                       :Διεθνές
+STR_AIRPORT_COMMUTER                                            :Ταξιδιωτικό
+STR_AIRPORT_INTERCONTINENTAL                                    :Διηπειρωτικό
+STR_AIRPORT_HELIPORT                                            :Ελικοδρόμιο
+STR_AIRPORT_HELIDEPOT                                           :Υπόστεγο ελικοπτέρων
+STR_AIRPORT_HELISTATION                                         :Στάθμος ελικοπτέρων
+
+STR_AIRPORT_CLASS_SMALL                                         :Μικρά αεροδρόμια
+STR_AIRPORT_CLASS_LARGE                                         :Μεγάλα αεροδρόμια
+STR_AIRPORT_CLASS_HUB                                           :Κομβίκα αεροδρόμια
+STR_AIRPORT_CLASS_HELIPORTS                                     :Ελικοδρόμια
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Παραγόμενος θόρυβος: {GOLD}{COMMA}
 
diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt
index 74001e976..0f74610a6 100644
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -2029,20 +2029,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}בנה �
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}בחירת שדה תעופה
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}בחר את גודל/סוג שדה התעופה
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}קטן
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}עירוני
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}מחוזי
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}בינלאומי
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}שדה תעופה מאסף
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}שדה תעופה בינלאומי
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}מנחת מסוקים
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}מוסך מסוקים
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}תחנת מסוקים
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}שדות תעופה קטנים
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}שדות תעופה גדולים
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}נמלי תעופה
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}שדות תעופה למסוקים
+STR_AIRPORT_SMALL                                               :קטן
+STR_AIRPORT_CITY                                                :עירוני
+STR_AIRPORT_METRO                                               :מחוזי
+STR_AIRPORT_INTERNATIONAL                                       :בינלאומי
+STR_AIRPORT_COMMUTER                                            :שדה תעופה מאסף
+STR_AIRPORT_INTERCONTINENTAL                                    :שדה תעופה בינלאומי
+STR_AIRPORT_HELIPORT                                            :מנחת מסוקים
+STR_AIRPORT_HELIDEPOT                                           :מוסך מסוקים
+STR_AIRPORT_HELISTATION                                         :תחנת מסוקים
+
+STR_AIRPORT_CLASS_SMALL                                         :שדות תעופה קטנים
+STR_AIRPORT_CLASS_LARGE                                         :שדות תעופה גדולים
+STR_AIRPORT_CLASS_HUB                                           :נמלי תעופה
+STR_AIRPORT_CLASS_HELIPORTS                                     :שדות תעופה למסוקים
 
 STR_STATION_BUILD_NOISE                                         :{GOLD}{COMMA}{BLACK} :רמת הרעש
 
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index c3728dbb6..de98aa639 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -2079,20 +2079,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Repülő
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Repülőtér beállítása
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Repülőtér méretének/típusának kiválasztása
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Kicsi
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Városi
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Nagyvárosi
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Nemzetközi
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Elővárosi
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Interkontinentális
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Helileszálló
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helihangár
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Heliállomás
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Kis repterek
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Nagy repterek
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Központi repterek
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helikopter-állomások
+STR_AIRPORT_SMALL                                               :Kicsi
+STR_AIRPORT_CITY                                                :Városi
+STR_AIRPORT_METRO                                               :Nagyvárosi
+STR_AIRPORT_INTERNATIONAL                                       :Nemzetközi
+STR_AIRPORT_COMMUTER                                            :Elővárosi
+STR_AIRPORT_INTERCONTINENTAL                                    :Interkontinentális
+STR_AIRPORT_HELIPORT                                            :Helileszálló
+STR_AIRPORT_HELIDEPOT                                           :Helihangár
+STR_AIRPORT_HELISTATION                                         :Heliállomás
+
+STR_AIRPORT_CLASS_SMALL                                         :Kis repterek
+STR_AIRPORT_CLASS_LARGE                                         :Nagy repterek
+STR_AIRPORT_CLASS_HUB                                           :Központi repterek
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helikopter-állomások
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Zajtermelés: {GOLD}{COMMA}
 
diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt
index 27d9d0449..507c9ab08 100644
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -1950,20 +1950,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Byggja f
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Flugvallastillingar
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Veldu stærð/tegund flugvallar
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Lítill flugvöllur
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Borgarflugvöllur
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Stórborgar
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Alþjóðlegt
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Innanlandsflugvöllur
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Meginlandsflugvöllur
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Þyrlupallur
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Þyrluskýli
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Þyrlustöð
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Litlir flugvellir
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Stórir flugvellir
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Háannaflugvellir
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Þyrluflugvellir
+STR_AIRPORT_SMALL                                               :Lítill flugvöllur
+STR_AIRPORT_CITY                                                :Borgarflugvöllur
+STR_AIRPORT_METRO                                               :Stórborgar
+STR_AIRPORT_INTERNATIONAL                                       :Alþjóðlegt
+STR_AIRPORT_COMMUTER                                            :Innanlandsflugvöllur
+STR_AIRPORT_INTERCONTINENTAL                                    :Meginlandsflugvöllur
+STR_AIRPORT_HELIPORT                                            :Þyrlupallur
+STR_AIRPORT_HELIDEPOT                                           :Þyrluskýli
+STR_AIRPORT_HELISTATION                                         :Þyrlustöð
+
+STR_AIRPORT_CLASS_SMALL                                         :Litlir flugvellir
+STR_AIRPORT_CLASS_LARGE                                         :Stórir flugvellir
+STR_AIRPORT_CLASS_HUB                                           :Háannaflugvellir
+STR_AIRPORT_CLASS_HELIPORTS                                     :Þyrluflugvellir
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Hávaði við flugvöll: {GOLD}{COMMA}
 
diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt
index 06ba93071..b28bcb86e 100644
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -2015,20 +2015,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Bangun b
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Pilih Bandara
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Pilih model bandara
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Bandara Kecil
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Bandara Kota
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Metropolitan
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Internasional
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Bandara Komuter
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Bandara Antar Benua
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Helipad
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helipad+Hangar
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Bandara Helikopter
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Ukuran kecil
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Ukuran besar
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Ukuran super
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helikopad
+STR_AIRPORT_SMALL                                               :Bandara Kecil
+STR_AIRPORT_CITY                                                :Bandara Kota
+STR_AIRPORT_METRO                                               :Metropolitan
+STR_AIRPORT_INTERNATIONAL                                       :Internasional
+STR_AIRPORT_COMMUTER                                            :Bandara Komuter
+STR_AIRPORT_INTERCONTINENTAL                                    :Bandara Antar Benua
+STR_AIRPORT_HELIPORT                                            :Helipad
+STR_AIRPORT_HELIDEPOT                                           :Helipad+Hangar
+STR_AIRPORT_HELISTATION                                         :Bandara Helikopter
+
+STR_AIRPORT_CLASS_SMALL                                         :Ukuran kecil
+STR_AIRPORT_CLASS_LARGE                                         :Ukuran besar
+STR_AIRPORT_CLASS_HUB                                           :Ukuran super
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helikopad
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Tingkat Kebisingan: {GOLD}{COMMA}
 
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index f5fa8c591..d3a426c11 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -2017,20 +2017,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Costruis
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Selezione aeroporto
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Seleziona dimensione/tipo di aeroporto
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Piccolo
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Cittadino
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Metropolitano
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Internazionale
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Minore
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Intercontinentale
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Eliporto
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Elideposito
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Elistazione
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Aeroporti piccoli
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Aeroporti grandi
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Aeroporti hub
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Eliporti
+STR_AIRPORT_SMALL                                               :Piccolo
+STR_AIRPORT_CITY                                                :Cittadino
+STR_AIRPORT_METRO                                               :Metropolitano
+STR_AIRPORT_INTERNATIONAL                                       :Internazionale
+STR_AIRPORT_COMMUTER                                            :Minore
+STR_AIRPORT_INTERCONTINENTAL                                    :Intercontinentale
+STR_AIRPORT_HELIPORT                                            :Eliporto
+STR_AIRPORT_HELIDEPOT                                           :Elideposito
+STR_AIRPORT_HELISTATION                                         :Elistazione
+
+STR_AIRPORT_CLASS_SMALL                                         :Aeroporti piccoli
+STR_AIRPORT_CLASS_LARGE                                         :Aeroporti grandi
+STR_AIRPORT_CLASS_HUB                                           :Aeroporti hub
+STR_AIRPORT_CLASS_HELIPORTS                                     :Eliporti
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Rumore generato: {GOLD}{COMMA}
 
diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
index 121ee49e9..f7a131550 100644
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -1969,20 +1969,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}空港�
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}空港の選択
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}空港のサイズ／種類を選択します
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}町空港
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}市空港
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}都市空港
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}国際空港
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}通勤空港
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}大陸間空港
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}ヘリポート
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}ヘリコプター庫
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}ヘリステーション
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}小型空港
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}大型空港
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}ハブ型空港
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}ヘリコプター空港
+STR_AIRPORT_SMALL                                               :町空港
+STR_AIRPORT_CITY                                                :市空港
+STR_AIRPORT_METRO                                               :都市空港
+STR_AIRPORT_INTERNATIONAL                                       :国際空港
+STR_AIRPORT_COMMUTER                                            :通勤空港
+STR_AIRPORT_INTERCONTINENTAL                                    :大陸間空港
+STR_AIRPORT_HELIPORT                                            :ヘリポート
+STR_AIRPORT_HELIDEPOT                                           :ヘリコプター庫
+STR_AIRPORT_HELISTATION                                         :ヘリステーション
+
+STR_AIRPORT_CLASS_SMALL                                         :小型空港
+STR_AIRPORT_CLASS_LARGE                                         :大型空港
+STR_AIRPORT_CLASS_HUB                                           :ハブ型空港
+STR_AIRPORT_CLASS_HELIPORTS                                     :ヘリコプター空港
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}発生した雑音：{GOLD}{COMMA}
 
diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index 25b13903f..9a6a50d93 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -2016,20 +2016,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}공항 �
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}공항 선택
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}공항의 크기/종류를 선택합니다.
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}소형 공항
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}도시 공항
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}대도시 공항
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}국제 공항
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}국내 공항
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}대륙간 공항
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}헬리콥터 탑승장
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}헬리콥터 격납고
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}헬리콥터 정류장
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}소형 공항
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}대형 공항
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}허브 공항
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}헬리콥터 공항
+STR_AIRPORT_SMALL                                               :소형 공항
+STR_AIRPORT_CITY                                                :도시 공항
+STR_AIRPORT_METRO                                               :대도시 공항
+STR_AIRPORT_INTERNATIONAL                                       :국제 공항
+STR_AIRPORT_COMMUTER                                            :국내 공항
+STR_AIRPORT_INTERCONTINENTAL                                    :대륙간 공항
+STR_AIRPORT_HELIPORT                                            :헬리콥터 탑승장
+STR_AIRPORT_HELIDEPOT                                           :헬리콥터 격납고
+STR_AIRPORT_HELISTATION                                         :헬리콥터 정류장
+
+STR_AIRPORT_CLASS_SMALL                                         :소형 공항
+STR_AIRPORT_CLASS_LARGE                                         :대형 공항
+STR_AIRPORT_CLASS_HUB                                           :허브 공항
+STR_AIRPORT_CLASS_HELIPORTS                                     :헬리콥터 공항
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}발생 소음: {GOLD}{COMMA}
 
diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt
index b2d96c79d..8a17e9d01 100644
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -1961,20 +1961,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Būvēt
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Lidostas izvēle
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Izvēlieties lidostas izmēru/veidu
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Maza
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Pilsēta
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Metropoles lidosta
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Starptautiskā lidosta
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Ikdienas satiksme
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Interkontinentāls
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Heliports
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helidepo
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Helistacija
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Mazas lidostas
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Lielās lidostas
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Centra lidostas
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helikopteru lidostas
+STR_AIRPORT_SMALL                                               :Maza
+STR_AIRPORT_CITY                                                :Pilsēta
+STR_AIRPORT_METRO                                               :Metropoles lidosta
+STR_AIRPORT_INTERNATIONAL                                       :Starptautiskā lidosta
+STR_AIRPORT_COMMUTER                                            :Ikdienas satiksme
+STR_AIRPORT_INTERCONTINENTAL                                    :Interkontinentāls
+STR_AIRPORT_HELIPORT                                            :Heliports
+STR_AIRPORT_HELIDEPOT                                           :Helidepo
+STR_AIRPORT_HELISTATION                                         :Helistacija
+
+STR_AIRPORT_CLASS_SMALL                                         :Mazas lidostas
+STR_AIRPORT_CLASS_LARGE                                         :Lielās lidostas
+STR_AIRPORT_CLASS_HUB                                           :Centra lidostas
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helikopteru lidostas
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Radītais troksnis: {GOLD}{COMMA}
 
diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt
index 4ac919d04..5f7b143d4 100644
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -2083,20 +2083,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Statyti
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Oro uosto pasirinkimas
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Pasirinkite oro uosto dydį/tipą
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Mažas
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Miestas
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Didmiesčio
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Internacionalinis
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Rajonas
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Tarpkontinentinis
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Heliportas
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helidepas
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Helistotis
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Maži orouostai
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Dideli orouostai
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Issisakojantys orouostai
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Heliportai
+STR_AIRPORT_SMALL                                               :Mažas
+STR_AIRPORT_CITY                                                :Miestas
+STR_AIRPORT_METRO                                               :Didmiesčio
+STR_AIRPORT_INTERNATIONAL                                       :Internacionalinis
+STR_AIRPORT_COMMUTER                                            :Rajonas
+STR_AIRPORT_INTERCONTINENTAL                                    :Tarpkontinentinis
+STR_AIRPORT_HELIPORT                                            :Heliportas
+STR_AIRPORT_HELIDEPOT                                           :Helidepas
+STR_AIRPORT_HELISTATION                                         :Helistotis
+
+STR_AIRPORT_CLASS_SMALL                                         :Maži orouostai
+STR_AIRPORT_CLASS_LARGE                                         :Dideli orouostai
+STR_AIRPORT_CLASS_HUB                                           :Issisakojantys orouostai
+STR_AIRPORT_CLASS_HELIPORTS                                     :Heliportai
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Sukeltas triukšmas: {GOLD}{COMMA}
 
diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt
index 0e584a968..7a56f9426 100644
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -2015,20 +2015,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Fluchhaf
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Fluchhafen Selectioun
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Wielt Gréisst/Typ vum Fluchhafen
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Kleng
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}City
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Metropolitär Fluchhafen
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Internationalen Fluchhafen
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Pendler
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Interkontinental
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Heliport
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helidepot
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Helistatioun
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Kleng Fluchhäfen
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Grouss Fluchhäfen
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK} Fluchhafen Verdeeler
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helicopter Fluchhafen
+STR_AIRPORT_SMALL                                               :Kleng
+STR_AIRPORT_CITY                                                :City
+STR_AIRPORT_METRO                                               :Metropolitär Fluchhafen
+STR_AIRPORT_INTERNATIONAL                                       :Internationalen Fluchhafen
+STR_AIRPORT_COMMUTER                                            :Pendler
+STR_AIRPORT_INTERCONTINENTAL                                    :Interkontinental
+STR_AIRPORT_HELIPORT                                            :Heliport
+STR_AIRPORT_HELIDEPOT                                           :Helidepot
+STR_AIRPORT_HELISTATION                                         :Helistatioun
+
+STR_AIRPORT_CLASS_SMALL                                         :Kleng Fluchhäfen
+STR_AIRPORT_CLASS_LARGE                                         :Grouss Fluchhäfen
+STR_AIRPORT_CLASS_HUB                                           : Fluchhafen Verdeeler
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helicopter Fluchhafen
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Kaméidi: {GOLD}{COMMA}
 
diff --git a/src/lang/malay.txt b/src/lang/malay.txt
index f54fcdcc4..54ad2c399 100644
--- a/src/lang/malay.txt
+++ b/src/lang/malay.txt
@@ -2013,20 +2013,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Bina lap
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Pilihan Lapangan Terbang
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Pilih saiz/jenis lapangan terbang
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Kecil
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Bandar
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Lapangan terbang metropolitan
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Lapangan terbang antarabangsa
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Komuter
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Antarabenua
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Helipad
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Depoh heli
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Stesen heli
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Lapangan terbang kecil
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Lapangan terbang besar
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Lapangan terbang hab
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Lapangan terbang helikopter
+STR_AIRPORT_SMALL                                               :Kecil
+STR_AIRPORT_CITY                                                :Bandar
+STR_AIRPORT_METRO                                               :Lapangan terbang metropolitan
+STR_AIRPORT_INTERNATIONAL                                       :Lapangan terbang antarabangsa
+STR_AIRPORT_COMMUTER                                            :Komuter
+STR_AIRPORT_INTERCONTINENTAL                                    :Antarabenua
+STR_AIRPORT_HELIPORT                                            :Helipad
+STR_AIRPORT_HELIDEPOT                                           :Depoh heli
+STR_AIRPORT_HELISTATION                                         :Stesen heli
+
+STR_AIRPORT_CLASS_SMALL                                         :Lapangan terbang kecil
+STR_AIRPORT_CLASS_LARGE                                         :Lapangan terbang besar
+STR_AIRPORT_CLASS_HUB                                           :Lapangan terbang hab
+STR_AIRPORT_CLASS_HELIPORTS                                     :Lapangan terbang helikopter
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Kebisingan: {GOLD}{COMMA}
 
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index 1d607580f..8a973edcf 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -2015,20 +2015,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Bygg fly
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Velg flyplasstype
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Velg størrelse/type flyplass
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Liten
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}By
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Metropol
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Internasjonal
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Pendler
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Interkontinental
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Helikopterplass
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helikopterhangar
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Helikopterstasjon
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Små flyplasser
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Store flyplasser
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Sentrumsflyplasser
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helikopterplasser
+STR_AIRPORT_SMALL                                               :Liten
+STR_AIRPORT_CITY                                                :By
+STR_AIRPORT_METRO                                               :Metropol
+STR_AIRPORT_INTERNATIONAL                                       :Internasjonal
+STR_AIRPORT_COMMUTER                                            :Pendler
+STR_AIRPORT_INTERCONTINENTAL                                    :Interkontinental
+STR_AIRPORT_HELIPORT                                            :Helikopterplass
+STR_AIRPORT_HELIDEPOT                                           :Helikopterhangar
+STR_AIRPORT_HELISTATION                                         :Helikopterstasjon
+
+STR_AIRPORT_CLASS_SMALL                                         :Små flyplasser
+STR_AIRPORT_CLASS_LARGE                                         :Store flyplasser
+STR_AIRPORT_CLASS_HUB                                           :Sentrumsflyplasser
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helikopterplasser
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Støy generert: {GOLD}{COMMA}
 
diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt
index 35e0dcaf9..45f93b557 100644
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -2016,20 +2016,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Bygg fly
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Vel flyplasstype
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Vel storleik og flyplasstype
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Liten
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}By
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Storbyflyplass
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Internasjonal flyplass
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Pendler
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Interkontinental
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Helikopterplass
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helikopterhangar
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Helikopterstasjon
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Små flyplassar
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Store flyplassar
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Sentrumsflyplassar
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helikopterplassar
+STR_AIRPORT_SMALL                                               :Liten
+STR_AIRPORT_CITY                                                :By
+STR_AIRPORT_METRO                                               :Storbyflyplass
+STR_AIRPORT_INTERNATIONAL                                       :Internasjonal flyplass
+STR_AIRPORT_COMMUTER                                            :Pendler
+STR_AIRPORT_INTERCONTINENTAL                                    :Interkontinental
+STR_AIRPORT_HELIPORT                                            :Helikopterplass
+STR_AIRPORT_HELIDEPOT                                           :Helikopterhangar
+STR_AIRPORT_HELISTATION                                         :Helikopterstasjon
+
+STR_AIRPORT_CLASS_SMALL                                         :Små flyplassar
+STR_AIRPORT_CLASS_LARGE                                         :Store flyplassar
+STR_AIRPORT_CLASS_HUB                                           :Sentrumsflyplassar
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helikopterplassar
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Støy generert: {GOLD}{COMMA}
 
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index 1164905a1..7ce2f2bda 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -2395,20 +2395,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Zbuduj l
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Wybór lotniska
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Wybierz wielkość/typ lotniska
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Małe
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Miejskie
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Stołeczne
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Międzynarodowe
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Lokalne
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Międzykontynentalne
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Klasyczne
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Serwisowe
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Stacja
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Małe lotniska
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Duże lotniska
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Główne lotniska
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Lądowiska
+STR_AIRPORT_SMALL                                               :Małe
+STR_AIRPORT_CITY                                                :Miejskie
+STR_AIRPORT_METRO                                               :Stołeczne
+STR_AIRPORT_INTERNATIONAL                                       :Międzynarodowe
+STR_AIRPORT_COMMUTER                                            :Lokalne
+STR_AIRPORT_INTERCONTINENTAL                                    :Międzykontynentalne
+STR_AIRPORT_HELIPORT                                            :Klasyczne
+STR_AIRPORT_HELIDEPOT                                           :Serwisowe
+STR_AIRPORT_HELISTATION                                         :Stacja
+
+STR_AIRPORT_CLASS_SMALL                                         :Małe lotniska
+STR_AIRPORT_CLASS_LARGE                                         :Duże lotniska
+STR_AIRPORT_CLASS_HUB                                           :Główne lotniska
+STR_AIRPORT_CLASS_HELIPORTS                                     :Lądowiska
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Wytwarzany hałas: {GOLD}{COMMA}
 
diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
index 9dc906e5e..a1ec1091a 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -2015,20 +2015,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Construi
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Selecção de Aeroporto
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Seleccionar tamanho/tipo de aeroporto
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Pequeno
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Cidade
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Metropolitano
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Internacional
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Transbordo
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Intercontinental
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Heliporto
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Heli-oficina
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Heli-estação
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Aeroportos pequenos
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Aeroportos grandes
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Aeroporto de ligação/transbordo
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Heliportos
+STR_AIRPORT_SMALL                                               :Pequeno
+STR_AIRPORT_CITY                                                :Cidade
+STR_AIRPORT_METRO                                               :Metropolitano
+STR_AIRPORT_INTERNATIONAL                                       :Internacional
+STR_AIRPORT_COMMUTER                                            :Transbordo
+STR_AIRPORT_INTERCONTINENTAL                                    :Intercontinental
+STR_AIRPORT_HELIPORT                                            :Heliporto
+STR_AIRPORT_HELIDEPOT                                           :Heli-oficina
+STR_AIRPORT_HELISTATION                                         :Heli-estação
+
+STR_AIRPORT_CLASS_SMALL                                         :Aeroportos pequenos
+STR_AIRPORT_CLASS_LARGE                                         :Aeroportos grandes
+STR_AIRPORT_CLASS_HUB                                           :Aeroporto de ligação/transbordo
+STR_AIRPORT_CLASS_HELIPORTS                                     :Heliportos
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Ruído gerado: {GOLD}{COMMA}
 
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index fbb7e9e76..5fee77914 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -2015,20 +2015,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Construi
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Alege tipul de aeroport
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Alege tipul şi mărimea aeroportului
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Mic
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Orăşenesc
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Metropolitan
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Internaţional
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Navetist
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Intercontinental
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Helidrom
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Hangar elicoptere
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Bază elicoptere
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Aeroporturi mici
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Aeroporturi mari
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Aeroporturi centrale
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Heliporturi
+STR_AIRPORT_SMALL                                               :Mic
+STR_AIRPORT_CITY                                                :Orăşenesc
+STR_AIRPORT_METRO                                               :Metropolitan
+STR_AIRPORT_INTERNATIONAL                                       :Internaţional
+STR_AIRPORT_COMMUTER                                            :Navetist
+STR_AIRPORT_INTERCONTINENTAL                                    :Intercontinental
+STR_AIRPORT_HELIPORT                                            :Helidrom
+STR_AIRPORT_HELIDEPOT                                           :Hangar elicoptere
+STR_AIRPORT_HELISTATION                                         :Bază elicoptere
+
+STR_AIRPORT_CLASS_SMALL                                         :Aeroporturi mici
+STR_AIRPORT_CLASS_LARGE                                         :Aeroporturi mari
+STR_AIRPORT_CLASS_HUB                                           :Aeroporturi centrale
+STR_AIRPORT_CLASS_HELIPORTS                                     :Heliporturi
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Zgomot generat: {GOLD}{COMMA}
 
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index 39349e12c..2a7bae05b 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -2185,20 +2185,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Стро
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Выбор аэропорта
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Выберите размер/тип аэропорта
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Малый
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Городской
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Федеральный
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Международный
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Пригородный
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Межконтинентальный
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Вертолётная площадка
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Вертолётное депо
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Вертолётная станция
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Малые аэропорты
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Средние аэропорты
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Большие аэропорты
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Вертолётные площадки
+STR_AIRPORT_SMALL                                               :Малый
+STR_AIRPORT_CITY                                                :Городской
+STR_AIRPORT_METRO                                               :Федеральный
+STR_AIRPORT_INTERNATIONAL                                       :Международный
+STR_AIRPORT_COMMUTER                                            :Пригородный
+STR_AIRPORT_INTERCONTINENTAL                                    :Межконтинентальный
+STR_AIRPORT_HELIPORT                                            :Вертолётная площадка
+STR_AIRPORT_HELIDEPOT                                           :Вертолётное депо
+STR_AIRPORT_HELISTATION                                         :Вертолётная станция
+
+STR_AIRPORT_CLASS_SMALL                                         :Малые аэропорты
+STR_AIRPORT_CLASS_LARGE                                         :Средние аэропорты
+STR_AIRPORT_CLASS_HUB                                           :Большие аэропорты
+STR_AIRPORT_CLASS_HELIPORTS                                     :Вертолётные площадки
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Производимый шум: {GOLD}{COMMA}
 
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index fdc677f28..4f94a3c71 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -2210,20 +2210,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Izgradnj
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Izbor aerodroma
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Izbor veličine/tipa aerodroma
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Poljski aerodrom
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Gradski aerodrom
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Regionalni aerodrom
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Međunarodni aerodrom
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Lokalni aerodrom
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Interkontinentalni aerodrom
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Helipad
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helihangar
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Helidrom
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Tercijarni promet
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Sekundarni promet
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Primarni promet
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helidromi
+STR_AIRPORT_SMALL                                               :Poljski aerodrom
+STR_AIRPORT_CITY                                                :Gradski aerodrom
+STR_AIRPORT_METRO                                               :Regionalni aerodrom
+STR_AIRPORT_INTERNATIONAL                                       :Međunarodni aerodrom
+STR_AIRPORT_COMMUTER                                            :Lokalni aerodrom
+STR_AIRPORT_INTERCONTINENTAL                                    :Interkontinentalni aerodrom
+STR_AIRPORT_HELIPORT                                            :Helipad
+STR_AIRPORT_HELIDEPOT                                           :Helihangar
+STR_AIRPORT_HELISTATION                                         :Helidrom
+
+STR_AIRPORT_CLASS_SMALL                                         :Tercijarni promet
+STR_AIRPORT_CLASS_LARGE                                         :Sekundarni promet
+STR_AIRPORT_CLASS_HUB                                           :Primarni promet
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helidromi
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Proizvedena buka: {GOLD}{COMMA}
 
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index 9090495d1..10b3dd44c 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -2004,20 +2004,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}新建�
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}飞机场选单
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}选择机场的大小和类型
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}小型机场
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}城市机场
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}国内机场
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}国际机场
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}通勤机场
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}全球机场
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}直升机停机楼
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}直升机专用机场
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}直升机小型机场
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}小型机场
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}大型机场
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}空运枢纽
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}直升机机场
+STR_AIRPORT_SMALL                                               :小型机场
+STR_AIRPORT_CITY                                                :城市机场
+STR_AIRPORT_METRO                                               :国内机场
+STR_AIRPORT_INTERNATIONAL                                       :国际机场
+STR_AIRPORT_COMMUTER                                            :通勤机场
+STR_AIRPORT_INTERCONTINENTAL                                    :全球机场
+STR_AIRPORT_HELIPORT                                            :直升机停机楼
+STR_AIRPORT_HELIDEPOT                                           :直升机专用机场
+STR_AIRPORT_HELISTATION                                         :直升机小型机场
+
+STR_AIRPORT_CLASS_SMALL                                         :小型机场
+STR_AIRPORT_CLASS_LARGE                                         :大型机场
+STR_AIRPORT_CLASS_HUB                                           :空运枢纽
+STR_AIRPORT_CLASS_HELIPORTS                                     :直升机机场
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}产生的噪音: {GOLD}{COMMA}
 
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index a4109bd6e..76ec9bba9 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -2082,20 +2082,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Postavit
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Vyber letiska
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Vybrat velkost/typ letiska
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Male
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Mestske
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Metropolitné
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Medzinárodné
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Vnutrostatne
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Medzikontinentalne
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Heliport
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Heliport s hangarom
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Velky heliport
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Male letiska
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Velke letiska
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Najvacsie letiska
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Heliporty
+STR_AIRPORT_SMALL                                               :Male
+STR_AIRPORT_CITY                                                :Mestske
+STR_AIRPORT_METRO                                               :Metropolitné
+STR_AIRPORT_INTERNATIONAL                                       :Medzinárodné
+STR_AIRPORT_COMMUTER                                            :Vnutrostatne
+STR_AIRPORT_INTERCONTINENTAL                                    :Medzikontinentalne
+STR_AIRPORT_HELIPORT                                            :Heliport
+STR_AIRPORT_HELIDEPOT                                           :Heliport s hangarom
+STR_AIRPORT_HELISTATION                                         :Velky heliport
+
+STR_AIRPORT_CLASS_SMALL                                         :Male letiska
+STR_AIRPORT_CLASS_LARGE                                         :Velke letiska
+STR_AIRPORT_CLASS_HUB                                           :Najvacsie letiska
+STR_AIRPORT_CLASS_HELIPORTS                                     :Heliporty
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Vytváraný hluk: {GOLD}{COMMA}
 
diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt
index 5536da25f..81c250b36 100644
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -2057,20 +2057,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Zgradi l
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Izbira letališča
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Izbira velikosti/tipa letališča
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Majno letališče
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Mestno
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Medmestno
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Mednarodno
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Vozač
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Medkontinentalno letališče
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Pristajališče
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helikopterska garaža
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Helikopterska postaja
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Majhna letališča
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Velika letališča
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Hub letališča
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helikopterska pristajališča
+STR_AIRPORT_SMALL                                               :Majno letališče
+STR_AIRPORT_CITY                                                :Mestno
+STR_AIRPORT_METRO                                               :Medmestno
+STR_AIRPORT_INTERNATIONAL                                       :Mednarodno
+STR_AIRPORT_COMMUTER                                            :Vozač
+STR_AIRPORT_INTERCONTINENTAL                                    :Medkontinentalno letališče
+STR_AIRPORT_HELIPORT                                            :Pristajališče
+STR_AIRPORT_HELIDEPOT                                           :Helikopterska garaža
+STR_AIRPORT_HELISTATION                                         :Helikopterska postaja
+
+STR_AIRPORT_CLASS_SMALL                                         :Majhna letališča
+STR_AIRPORT_CLASS_LARGE                                         :Velika letališča
+STR_AIRPORT_CLASS_HUB                                           :Hub letališča
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helikopterska pristajališča
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Efektivni hrup: {GOLD}{COMMA}
 
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index a78487ce2..1e3bca879 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -2016,20 +2016,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Construi
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Selección de aeropuerto
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Elige tamaño/tipo de aeropuerto
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Pequeño
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Ciudad
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Metropolitano
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Internacional
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Intercambio
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Intercontinental
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Helipuerto
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helihangar
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Heliestación
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Aeropuertos pequeños
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Aeropuertos grandes
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Aeropuertos centrales
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helipuertos
+STR_AIRPORT_SMALL                                               :Pequeño
+STR_AIRPORT_CITY                                                :Ciudad
+STR_AIRPORT_METRO                                               :Metropolitano
+STR_AIRPORT_INTERNATIONAL                                       :Internacional
+STR_AIRPORT_COMMUTER                                            :Intercambio
+STR_AIRPORT_INTERCONTINENTAL                                    :Intercontinental
+STR_AIRPORT_HELIPORT                                            :Helipuerto
+STR_AIRPORT_HELIDEPOT                                           :Helihangar
+STR_AIRPORT_HELISTATION                                         :Heliestación
+
+STR_AIRPORT_CLASS_SMALL                                         :Aeropuertos pequeños
+STR_AIRPORT_CLASS_LARGE                                         :Aeropuertos grandes
+STR_AIRPORT_CLASS_HUB                                           :Aeropuertos centrales
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helipuertos
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Ruido generado: {GOLD}{COMMA}
 
diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt
index 5e3a97f4a..7209609ca 100644
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -2015,20 +2015,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Bygg fly
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Val av flygplats
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Välj storlek/typ av flygplats
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Liten
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Stad
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Storstads-flygplats
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Internationell flygplats
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Pendlare
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Interkontinental
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Helikopterplatta
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Helikopterhangar
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Helikopterstation
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Små flygfält
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Stora flygplatser
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Centrala flygplatser
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helikopterplattformar
+STR_AIRPORT_SMALL                                               :Liten
+STR_AIRPORT_CITY                                                :Stad
+STR_AIRPORT_METRO                                               :Storstads-flygplats
+STR_AIRPORT_INTERNATIONAL                                       :Internationell flygplats
+STR_AIRPORT_COMMUTER                                            :Pendlare
+STR_AIRPORT_INTERCONTINENTAL                                    :Interkontinental
+STR_AIRPORT_HELIPORT                                            :Helikopterplatta
+STR_AIRPORT_HELIDEPOT                                           :Helikopterhangar
+STR_AIRPORT_HELISTATION                                         :Helikopterstation
+
+STR_AIRPORT_CLASS_SMALL                                         :Små flygfält
+STR_AIRPORT_CLASS_LARGE                                         :Stora flygplatser
+STR_AIRPORT_CLASS_HUB                                           :Centrala flygplatser
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helikopterplattformar
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Genererat buller: {GOLD}{COMMA}
 
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index 484729149..8b877f89e 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -2015,20 +2015,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}興建�
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}選擇機場
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}選擇機場大小／種類
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}小機場
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}城市機場
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}都會機場
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}國際機場
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}通勤機場
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}洲際機場
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}直升機坪
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}直升機棚
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}直升機站
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}小型機場
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}大型機場
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}轉運機場
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}直升機場
+STR_AIRPORT_SMALL                                               :小機場
+STR_AIRPORT_CITY                                                :城市機場
+STR_AIRPORT_METRO                                               :都會機場
+STR_AIRPORT_INTERNATIONAL                                       :國際機場
+STR_AIRPORT_COMMUTER                                            :通勤機場
+STR_AIRPORT_INTERCONTINENTAL                                    :洲際機場
+STR_AIRPORT_HELIPORT                                            :直升機坪
+STR_AIRPORT_HELIDEPOT                                           :直升機棚
+STR_AIRPORT_HELISTATION                                         :直升機站
+
+STR_AIRPORT_CLASS_SMALL                                         :小型機場
+STR_AIRPORT_CLASS_LARGE                                         :大型機場
+STR_AIRPORT_CLASS_HUB                                           :轉運機場
+STR_AIRPORT_CLASS_HELIPORTS                                     :直升機場
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}產生噪音：{GOLD}{COMMA}
 
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index ad71c191c..f6753f5c3 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -2016,20 +2016,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Havalima
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Havalimanı seçimi
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Havalimanı boyutunu seç
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Küçük
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Şehirlerarası
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Büyükşehir
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Uluslararası
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Abonman
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Kıtalararası
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Heliport
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Heligaraj
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Helistasyon
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Küçük havalimanları
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Büyük Havalimanları
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Merkezi havalimanları
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helikopter havalimanları
+STR_AIRPORT_SMALL                                               :Küçük
+STR_AIRPORT_CITY                                                :Şehirlerarası
+STR_AIRPORT_METRO                                               :Büyükşehir
+STR_AIRPORT_INTERNATIONAL                                       :Uluslararası
+STR_AIRPORT_COMMUTER                                            :Abonman
+STR_AIRPORT_INTERCONTINENTAL                                    :Kıtalararası
+STR_AIRPORT_HELIPORT                                            :Heliport
+STR_AIRPORT_HELIDEPOT                                           :Heligaraj
+STR_AIRPORT_HELISTATION                                         :Helistasyon
+
+STR_AIRPORT_CLASS_SMALL                                         :Küçük havalimanları
+STR_AIRPORT_CLASS_LARGE                                         :Büyük Havalimanları
+STR_AIRPORT_CLASS_HUB                                           :Merkezi havalimanları
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helikopter havalimanları
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Üretilen gürültü: {GOLD}{COMMA}
 
diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt
index 2e8be4ac7..3a1a63d77 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -2140,20 +2140,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Буду
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Вибір аеропорту
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Виберіть розмір/тип аеропорту
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Малий
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Міський
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Столичний
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Міжнародний
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Приміський
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Міжконтинентальний
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Гелікопорт
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Депо
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Гелікоптерна станція
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Малі аеропорти
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Великі аеропорти
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Вузлові аеропорти
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Геліко-аеропорт
+STR_AIRPORT_SMALL                                               :Малий
+STR_AIRPORT_CITY                                                :Міський
+STR_AIRPORT_METRO                                               :Столичний
+STR_AIRPORT_INTERNATIONAL                                       :Міжнародний
+STR_AIRPORT_COMMUTER                                            :Приміський
+STR_AIRPORT_INTERCONTINENTAL                                    :Міжконтинентальний
+STR_AIRPORT_HELIPORT                                            :Гелікопорт
+STR_AIRPORT_HELIDEPOT                                           :Депо
+STR_AIRPORT_HELISTATION                                         :Гелікоптерна станція
+
+STR_AIRPORT_CLASS_SMALL                                         :Малі аеропорти
+STR_AIRPORT_CLASS_LARGE                                         :Великі аеропорти
+STR_AIRPORT_CLASS_HUB                                           :Вузлові аеропорти
+STR_AIRPORT_CLASS_HELIPORTS                                     :Геліко-аеропорт
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Генерований шум: {GOLD}{COMMA}
 
diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt
index 7dcd4ad80..72aecf6d9 100644
--- a/src/lang/vietnamese.txt
+++ b/src/lang/vietnamese.txt
@@ -2015,20 +2015,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Xây sâ
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Chọn loại sân bay
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Chọn kích cỡ và kiểu sân bay
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Cực nhỏ
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Đô thị
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Đô thị trung tâm
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Quốc tế
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Nhỏ
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Liên lục địa
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Sân bay trực thăng
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Sân bay trực thăng vừa
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Sân bay trực thăng lớn
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Sân bay nhỏ
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Sân bay trung bình
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Sân bay lớn
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Sân bay trực thăng
+STR_AIRPORT_SMALL                                               :Cực nhỏ
+STR_AIRPORT_CITY                                                :Đô thị
+STR_AIRPORT_METRO                                               :Đô thị trung tâm
+STR_AIRPORT_INTERNATIONAL                                       :Quốc tế
+STR_AIRPORT_COMMUTER                                            :Nhỏ
+STR_AIRPORT_INTERCONTINENTAL                                    :Liên lục địa
+STR_AIRPORT_HELIPORT                                            :Sân bay trực thăng
+STR_AIRPORT_HELIDEPOT                                           :Sân bay trực thăng vừa
+STR_AIRPORT_HELISTATION                                         :Sân bay trực thăng lớn
+
+STR_AIRPORT_CLASS_SMALL                                         :Sân bay nhỏ
+STR_AIRPORT_CLASS_LARGE                                         :Sân bay trung bình
+STR_AIRPORT_CLASS_HUB                                           :Sân bay lớn
+STR_AIRPORT_CLASS_HELIPORTS                                     :Sân bay trực thăng
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Độ ồn tạo ra: {GOLD}{COMMA}
 
diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt
index eccd5fe34..df6108caa 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -1951,20 +1951,20 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Adeiladu
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Dewiswch Faes Awyr
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Dewiswch maint/math y maes awyr
 
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Bach
-STR_STATION_BUILD_AIRPORT_CITY_AIRPORT                          :{BLACK}Dinas
-STR_STATION_BUILD_AIRPORT_METRO_AIRPORT                         :{BLACK}Maes awyr metropolitan
-STR_STATION_BUILD_AIRPORT_INTERNATIONAL_AIRPORT                 :{BLACK}Rhyngwladol
-STR_STATION_BUILD_AIRPORT_COMMUTER_AIRPORT                      :{BLACK}Cymudol
-STR_STATION_BUILD_AIRPORT_INTERCONTINENTAL_AIRPORT              :{BLACK}Rhyng-gyfandirol
-STR_STATION_BUILD_AIRPORT_HELIPORT                              :{BLACK}Porth Hofrennydd
-STR_STATION_BUILD_AIRPORT_HELIDEPOT                             :{BLACK}Depo Hofrennydd
-STR_STATION_BUILD_AIRPORT_HELISTATION                           :{BLACK}Gorsaf Hofrennydd
-
-STR_STATION_BUILD_AIRPORT_SMALL_AIRPORTS                        :{BLACK}Meysydd awyr bach
-STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Meysydd awyr mawr
-STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Meysydd awyr cyfnewid
-STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Meysydd awyr hofrennydd
+STR_AIRPORT_SMALL                                               :Bach
+STR_AIRPORT_CITY                                                :Dinas
+STR_AIRPORT_METRO                                               :Maes awyr metropolitan
+STR_AIRPORT_INTERNATIONAL                                       :Rhyngwladol
+STR_AIRPORT_COMMUTER                                            :Cymudol
+STR_AIRPORT_INTERCONTINENTAL                                    :Rhyng-gyfandirol
+STR_AIRPORT_HELIPORT                                            :Porth Hofrennydd
+STR_AIRPORT_HELIDEPOT                                           :Depo Hofrennydd
+STR_AIRPORT_HELISTATION                                         :Gorsaf Hofrennydd
+
+STR_AIRPORT_CLASS_SMALL                                         :Meysydd awyr bach
+STR_AIRPORT_CLASS_LARGE                                         :Meysydd awyr mawr
+STR_AIRPORT_CLASS_HUB                                           :Meysydd awyr cyfnewid
+STR_AIRPORT_CLASS_HELIPORTS                                     :Meysydd awyr hofrennydd
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Swn a gynhyrchir: {GOLD}{COMMA}