merge airdrome_N with aerodrome_N

2026-04-21 10:49:33 -06:00 · 2015-05-18 19:30:23 +00:00
parent 975b39716a
commit 7677430165
13 changed files with 6 additions and 19 deletions
--- a/lib/src/translator/Dictionary.gf
+++ b/lib/src/translator/Dictionary.gf
@@ -1388,7 +1388,6 @@ fun aircrew_N : N ;
 fun aircrewman_N : N ;
 fun airdock_N : N ;
 fun airdrie_PN : PN ;
-fun airdrome_N : N ;
 fun airdrop_N : N ;
 fun aireborough_PN : PN ;
 fun airedale_N : N ;
--- a/lib/src/translator/DictionaryBul.gf
+++ b/lib/src/translator/DictionaryBul.gf
@@ -1395,12 +1395,11 @@ lin aircrew_N = mkN007 "екипаж" ;
 lin aircrewman_N = variants {} ;
 lin airdock_N = variants {} ;
 lin airdrie_PN = mkPN "Айдрие" Masc ;
-lin airdrome_N = mkN037 "аеродрум" ;
 lin airdrop_N = variants {} ;
 lin aireborough_PN = mkPN "Аиребуроу" Masc ;
 lin airedale_N = variants {} ;
 lin airfare_N = variants {} ;
-lin airfield_N = variants {mkN007 "аеродрум"; mkN066 "летище"} ; ----
+lin airfield_N = mkN007 "аеродрум";
 lin airflow_N = variants {} ;
 lin airfoil_N = mkN041 "лопатка" ;
 lin airforce_N = variants {} ;
--- a/lib/src/translator/DictionaryChi.gf
+++ b/lib/src/translator/DictionaryChi.gf
@@ -747,7 +747,7 @@ lin aeriform_A = mkA "幻想" | mkA "无实体" | mkA "空气状" | mkA "象空
 lin aerobe_N = mkN "好氧性生物" ; -- open-multilingual-wordnet
 lin aerobiosis_N = mkN "好氧生活" | mkN "需氧生活" ; -- open-multilingual-wordnet
 lin aerodontalgia_N = mkN "高空牙痛症" ; -- open-multilingual-wordnet
-lin aerodrome_N = mkN "飞机场""" ;
+lin aerodrome_N = mkN "机场" | mkN "飞机场" ; -- open-multilingual-wordnet
 lin aerodynamic_A = mkA "空气动力学" ;
 lin aerodynamics_N = mkN "空气动力学" ; -- open-multilingual-wordnet
 lin aerolite_N = mkN "陨石" ; -- open-multilingual-wordnet
@@ -1010,7 +1010,6 @@ lin aircrew_N = mkN "全体机员" ; -- open-multilingual-wordnet
 lin aircrewman_N = mkN "机组人员" ; -- open-multilingual-wordnet
 lin airdock_N = mkN "机库" | mkN "飞机库" | mkN "飞机棚" ; -- open-multilingual-wordnet
 lin airdrie_PN = mkPN "艾尔德里" ; -- comment=src=geonames status=guess
-lin airdrome_N = mkN "机场" | mkN "飞机场" ; -- open-multilingual-wordnet
 lin aireborough_PN = foreignPN "Aireborough" ; -- comment=src=eng status=guess
 lin airfare_N = mkN "机票价格" | mkN "飞机票价" | mkN "飞机费用" ; -- open-multilingual-wordnet
 lin airfield_N = mkN "机场" | {-HSK-} mkN "机场" "家" ;
--- a/lib/src/translator/DictionaryEng.gf
+++ b/lib/src/translator/DictionaryEng.gf
@@ -1021,7 +1021,7 @@ lin aerobics_N = mkN "aerobics" ;
 lin aerobiosis_N = mkN "aerobiosis" ;
 lin aerobiotic_A = mkA "aerobiotic" ;
 lin aerodontalgia_N = mkN "aerodontalgia" ;
-lin aerodrome_N = mkN "aerodrome" "aerodromes";
+lin aerodrome_N = variants {mkN "aerodrome" "aerodromes"; mkN "airdrome" "airdromes"};
 lin aerodynamic_A = compoundA (mkA "aerodynamic");
 lin aerodynamics_N = mkN "aerodynamics" "aerodynamics";
 lin aerolite_N = mkN "aerolite" ;
@@ -1397,7 +1397,6 @@ lin aircrew_N = mkN "aircrew" "aircrews";
 lin aircrewman_N = mkN masculine (mkN "aircrewman");
 lin airdock_N = mkN "airdock" ;
 lin airdrie_PN = mkPN "Airdrie";
-lin airdrome_N = mkN "airdrome" "airdromes";
 lin airdrop_N = mkN "airdrop" ;
 lin aireborough_PN = mkPN "Aireborough";
 lin airedale_N = mkN "airedale" "airedales";
--- a/lib/src/translator/DictionaryFin.gf
+++ b/lib/src/translator/DictionaryFin.gf
@@ -1331,7 +1331,6 @@ lin aircrew_N = mkWN (k2 "miehistö") "lentokoneen" ; --UNCHK
 lin aircrewman_N = mkWN (k32 "jäsen") "lentokoneen" "miehistön" ; --UNCHK
 lin airdock_N = mkWN (k5 "lentokonehalli") ; --UNCHK
 lin airdrie_PN = foreignPN "Airdrie" ;
-lin airdrome_N = mkWN (compoundN "lento" (k10A "kenttä")) ; --UNCHK
 lin airdrop_N = mkWN (compoundN "laskuvarjo" (k39 "pudotus")) ; --UNCHK
 lin airedale_N = mkWN (compoundN "airedalen" (k5 "terrieri")) ; --UNCHK
 lin airfare_N = mkWN (k9A "hinta") "lentolipun" ; --UNCHK
--- a/lib/src/translator/DictionaryFre.gf
+++ b/lib/src/translator/DictionaryFre.gf
@@ -798,7 +798,6 @@ lin aircraft_N = mkN "aéronef" masculine ; -- tocheck
 lin aircrew_N = mkN "groupe" ; -- UWN
 lin airdock_N = mkN "han" | mkN "hangar" ; -- UWN
 lin airdrie_PN = mkPN "Airdrie" ; -- status=guess src=geonames
-lin airdrome_N = mkN "airport" | mkN "aérodrome" | mkN "aéroport" ; -- UWN
 lin airfield_N = mkN "aérodrome" | mkN "piste" | mkN "terrain" ; -- UWN
 lin airfoil_N = mkN "profil" | mkN "profil_d'aile" | mkN "surface" ; -- UWN
 lin airing_N = mkN "aération" | mkN "ventilation" ; -- UWN
--- a/lib/src/translator/DictionaryGer.gf
+++ b/lib/src/translator/DictionaryGer.gf
@@ -1402,7 +1402,6 @@ lin aircrew_N = variants {} ;
 lin aircrewman_N = variants {} ;
 lin airdock_N = variants {} ;
 lin airdrie_PN = mkPN "Airdrie" ; -- src=geonames status=guess
-lin airdrome_N = variants {} ;
 lin airdrop_N = variants {} ;
 lin aireborough_PN = mkPN "Aireborough" ; -- src=eng status=guess
 lin airedale_N = variants {} ;
--- a/lib/src/translator/DictionaryHin.gf
+++ b/lib/src/translator/DictionaryHin.gf
@@ -725,7 +725,7 @@ lin aerial_N = mkN "एरियल" ; -- tocheck
 lin aerobatics_N = mkN "हवाई करतब" ; -- tocheck              
 lin aerobic_A = mkA "वातापेक्षी" ; -- tocheck       
 lin aerobics_N = mkN "वातापेक्षी व्यायाम" ; -- tocheck       
-lin aerodrome_N = mkN "हवाई-अड्डा" ; -- tocheck              
+lin aerodrome_N = mkN "हवाई-अड्डा" ; -- tocheck
 lin aerodynamic_A = mkA "वायुगतिकीय" ; -- tocheck              
 lin aerodynamics_N = mkN "वायुगतिकी" ; -- tocheck              
 lin aeromechanics_N = mkN "वायुगतिकी" ; -- tocheck       
@@ -898,7 +898,6 @@ lin airbrush_N = mkN "एयर ब्रश" ; -- tocheck
 lin airbus_N = mkN "वायु-बस" ; -- tocheck       
 lin aircraftman_N = mkN "वायु सेना का सबसे छोटा पदाधिकारी" ; -- tocheck              
 lin aircrew_N = mkN "हवाई कर्मी" ; -- tocheck              
-lin airdrome_N = mkN "हवाई-अड्डा" ; -- tocheck              
 lin airfield_N = mkN "हवाई अड्डा" ; -- tocheck              
 lin airfoil_N = mkN "विमान पतवार" ; -- tocheck       
 lin airforce_N = mkN "वायु सेना" ; -- tocheck       
--- a/lib/src/translator/DictionaryIta.gf
+++ b/lib/src/translator/DictionaryIta.gf
@@ -534,7 +534,7 @@ lin aerobatics_N = mkN "acrobazia" | mkN "acrobazie_aeree" ; -- UWN
 lin aerobe_N = mkN "aerobio" ; -- UWN
 lin aerobic_A = mkA "aerobico" ; -- status=guess
 lin aerobiosis_N = mkN "aerobiosi" feminine ; -- status=guess
-lin aerodrome_N = mkN "aerodromo" | mkN "aeroporto" | mkN "aerostazione" | mkN "campo_d'_aviazione" ; -- UWN
+lin aerodrome_N = mkN "aerodromo" | mkN "aerostazione";
 lin aerodynamics_N = mkN "aerodinamica" ; -- status=guess
 lin aerolite_N = mkN "aerolite" masculine ; -- status=guess
 lin aerolitic_A = mkA "aerolitico" ; -- status=guess
@@ -685,7 +685,6 @@ lin aircraft_N = mkN "aeromobile" feminine ; -- status=guess
 lin aircrew_N = mkN "equipaggio" ; -- UWN
 lin airdock_N = mkN "aerorimessa" | mkN "aviorimessa" | mkN "capannone" | mkN "hangar" ; -- UWN
 lin airdrie_PN = mkPN "Airdrie" ; -- status=guess src=geonames
-lin airdrome_N = mkN "aerodromo" | mkN "aeroporto" | mkN "aerostazione" | mkN "campo_d'_aviazione" ; -- UWN
 lin airfield_N = mkN "aerodromo" ; -- status=guess
 lin airframe_N = mkN "cellula" ; -- UWN
 lin airhead_N = mkN "svampita" ; -- status=guess
@@ -697,7 +696,7 @@ lin airliner_N = mkN "aeromobile" ; -- UWN
 lin airlock_N = mkN "camera_d'equilibrio" ; -- UWN
 lin airman_N = mkN "aviere" masculine ; -- status=guess
 lin airplane_N = L.airplane_N ; -- comment=CHECKED
-lin airport_N = mkN "aeroporto" ; -- status=guess
+lin airport_N = mkN "aeroporto";
 lin airs_N = mkN "atteggiamento" ; -- UWN
 lin airship_N = mkN "aeronave" | mkN "dirigibile" ; -- UWN
 lin airsickness_N = mkN "mal_d'aria" ; -- UWN
--- a/lib/src/translator/DictionarySpa.gf
+++ b/lib/src/translator/DictionarySpa.gf
@@ -851,7 +851,6 @@ lin airbus_N = mkN "aerobus" masculine ; -- status=guess
 lin aircraft_N = mkN "aeronave" feminine ;
 lin aircrew_N = mkN "tripulación" | mkN "tripulación_aérea" ; --UWN
 lin airdrie_PN = mkPN "Airdrie" ; -- status=guess src=geonames
-lin airdrome_N = mkN "aeropuerto" ; --UWN
 lin airfield_N = mkN "aeródromo" | mkN "campo de aviación" ; -- status=guess status=guess
 lin airflow_N = mkN "corriente" | mkN "corriente_de_air" ; --UWN
 lin airfoil_N = mkN "perfil alar" | mkN "perfil aerodinámico" | mkN "perfil" masculine ; -- status=guess status=guess status=guess
--- a/lib/src/translator/DictionarySwe.gf
+++ b/lib/src/translator/DictionarySwe.gf
@@ -1391,7 +1391,6 @@ lin aircrew_N = mkN "flygplansbesättning" ;
 lin aircrewman_N = variants {} ; -- status=guess
 lin airdock_N = variants {} ; -- status=guess
 lin airdrie_PN = mkPN "Airdrie" neutrum ; -- src=geonames status=guess
-lin airdrome_N = variants {} ; -- status=guess
 lin airdrop_N = mkN "luftlandsättningar"; -- src=google
 lin aireborough_PN = mkPN "Aireborough" ; -- src=eng status=guess
 lin airedale_N = variants {} ; -- status=guess
--- a/lib/src/translator/DictionaryTha.gf
+++ b/lib/src/translator/DictionaryTha.gf
@@ -961,7 +961,6 @@ lin aircraftsman_N = mkN "ทหารอากาศชั้นประทว
 lin aircrew_N = mkN "พนักงานเครื่องบิน" | mkN "ลูกเรือเครื่องบิน" | mkN "พนักงานประจำเครื่องบิน" | mkN "ลูกเรือบนเครื่องบิน" ; -- src=panlex
 lin aircrewman_N = mkN "ลูกเรือ" | mkN "ลูกเรือบนเครื่องบิน" ; -- src=panlex
 lin airdock_N = mkN "โรงเก็บเครื่องบิน" ; -- src=panlex
-lin airdrome_N = mkN "สนามบิน" | mkN "ท่าอากาศยาน" | mkN "สนามบิน" ; -- src=panlex
 lin airdrop_N = mkN "การกระโดดร่มชูชีพจากเครื่องบิน" ; -- src=panlex
 lin airfare_N = mkN "ค่าเครื่องบิน" | mkN "ค่าตั๋วเครื่องบิน" ; -- src=panlex
 lin airfield_N = mkN "ลานบิน" | mkN "ลานบิน" ; -- src=panlex
--- a/lib/src/translator/translate.probs
+++ b/lib/src/translator/translate.probs
@@ -1600,7 +1600,6 @@ aircrew_N	3.729715012475897e-6
 aircrewman_N	3.729715012475897e-6
 airdock_N	3.729715012475897e-6
 airdrie_PN	1.865462821325971e-5
-airdrome_N	3.729715012475897e-6
 airdrop_N	3.729715012475897e-6
 aireborough_PN	1.865462821325971e-5
 airedale_N	3.729715012475897e-6