1
0
forked from GitHub/gf-core

added never_AdV to many Dictionaries, removed equivalents of "republic of" from country names

This commit is contained in:
aarne
2014-06-20 09:25:13 +00:00
parent adb4b64c87
commit 23ba885adf
6 changed files with 35 additions and 31 deletions

View File

@@ -1,6 +1,6 @@
---- checked by EdG till spread_V in the BNC order
concrete DictionaryDut of Dictionary = CatDut
** open ParadigmsDut, (L = LexiconDut), (S = SyntaxDut), IrregDut, (I = IrregDut), (R = ResDut) in {
** open ParadigmsDut, (L = LexiconDut), (S = SyntaxDut), IrregDut, (I = IrregDut), (R = ResDut), Prelude in {
---- these should be somewhere else, in a library module
oper mkInterj : Str -> Interj = \s -> lin Interj {s = s} ;
@@ -10974,6 +10974,7 @@ lin neutral_A = mkA "neutraal" ; -- status=guess
lin neutrality_N = mkN "neutraliteit" ; -- status=guess
lin neutrino_N = mkN "neutrino" masculine ; -- status=guess
lin neutron_N = mkN "neutron" neuter ; -- status=guess
lin never_AdV = lin AdV (ss "nooit") ;
lin never_Adv = mkAdv "nooit" ;
lin nevertheless_Adv = mkAdv "desondanks" | mkAdv "desalniettemin" | mkAdv "niettemin" | mkAdv "niettegenstaande" | mkAdv "toch" ;
lin new_A = L.new_A ;
@@ -19027,7 +19028,7 @@ lin chesterfield_PN = mkPN "Chesterfield" ; -- src=geonames status=guess
lin chicago_PN = mkPN "Chicago" ; -- src=geonames status=guess
lin chichester_PN = mkPN "Chichester" ; -- src=geonames status=guess
lin chile_PN = mkPN "Chili" ; -- src=geonames status=guess
lin china_PN = mkPN "Volksrepubliek China" ; -- src=geonames status=guess
lin china_PN = mkPN "China" ; -- src=geonames status=guess
lin chinchow_PN = mkPN "Chinchow" ; -- src=eng status=guess
lin chippenham_PN = mkPN "Chippenham" ; -- src=geonames status=guess
lin chloe_PN = mkPN "Chloe" ; -- src=eng status=guess
@@ -19718,7 +19719,7 @@ lin inverness_PN = mkPN "Inverness" ; -- src=geonames status=guess
lin inverurie_PN = mkPN "Inverurie" ; -- src=geonames status=guess
lin iowa_PN = mkPN "Iowa" ; -- src=geonames status=guess
lin ipswich_PN = mkPN "Ipswich" ; -- src=geonames status=guess
lin iran_PN = mkPN "Iran (Islamitische Republiek)" ; -- src=geonames status=guess
lin iran_PN = mkPN "Iran" ; -- src=geonames status=guess
lin iraq_PN = mkPN "Irak" ; -- src=geonames status=guess
lin ireland_PN = mkPN "Ierland" ; -- src=geonames status=guess
lin irene_PN = mkPN "Irene" ; -- src=eng status=guess
@@ -19973,7 +19974,7 @@ lin leyland_PN = mkPN "Leyland" ; -- src=geonames status=guess
lin lib_PN = mkPN "Lib" ; -- src=geonames status=guess
lin liberia_PN = mkPN "Liberia" ; -- src=geonames status=guess
lin libra_PN = mkPN "Libra" ; -- src=eng status=guess
lin libya_PN = mkPN "Libische Arabische Republiek" ; -- src=geonames status=guess
lin libya_PN = mkPN "Libia" ; -- src=geonames status=guess
lin lichfield_PN = mkPN "Lichfield" ; -- src=geonames status=guess
lin liechtenstein_PN = mkPN "Liechtenstein" ; -- src=geonames status=guess
lin liege_PN = mkPN "Liege" ; -- src=eng status=guess
@@ -20936,7 +20937,7 @@ lin tadley_PN = mkPN "Tadley" ; -- src=geonames status=guess
lin taegu_PN = mkPN "Taegu" ; -- src=eng status=guess
lin tahiti_PN = mkPN "Tahiti" ; -- src=eng status=guess
lin taipei_PN = mkPN "Taipei" ; -- src=geonames status=guess
lin taiwan_PN = mkPN "Republiek China" ; -- src=geonames status=guess
lin taiwan_PN = mkPN "China" ; -- src=geonames status=guess
lin taiyuan_PN = mkPN "Taiyuan" ; -- src=geonames status=guess
lin tampere_PN = mkPN "Tampere" ; -- src=geonames status=guess
lin tamworth_PN = mkPN "Tamworth" ; -- src=geonames status=guess

View File

@@ -32798,7 +32798,7 @@ lin naysaying_N = mkWN "kieltäytyminen" ; --UNCHK
lin nazi_A = mkWA (compoundA "kansallis" (k38 "sosialistinen")) ; --UNCHK
lin nazi_N = mkWN (k5 "natsi") "saksalainen" ; --UNCHK
lin nazism_N = mkWN (k5 "natsismi") ; --UNCHK
lin ne'er_Adv = mkWAdv (k99 "koskaan") ; --UNCHK
lin ne'er_Adv = mkWAdv (k99 "ei koskaan") ; --UNCHK
lin ne_plus_ultra_N = mkWN (k40 "virheettömyys") ; --UNCHK
lin neanderthal_A = mkWA (compoundA "neandert" (k36 "alin")) ; --UNCHK
lin neap_N = mkWN (compoundN "nousu" (k27 "vesi")) "matalin" ; --UNCHK
@@ -33114,8 +33114,8 @@ lin neutron_N = mkWN (k5 "neutroni") ; --UNCHK
lin neutropenia_N = mkWN "neutropenia" ; --UNCHK
lin neutrophil_N = mkWN "neutrofiili" ; --UNCHK
lin neve_N = mkWN (compoundN "lumi" (k18 "jää")) ; --UNCHK
lin never_AdV = mkAdV "koskaan" ;
lin never_Adv = mkAdv "koskaan" | mkAdv "ei koskaan" ; ---- will look weird in sentences
lin never_AdV = mkAdV "ei koskaan" ;
lin never_Adv = mkAdv "ei koskaan" | mkAdv "koskaan" ; ---- will look weird in sentences
lin nevermore_Adv = mkWAdv (k99 "koskaan") "ei" "enää" ; --UNCHK
lin nevertheless_Adv = mkAdv "kuitenkin" ;
lin nevirapine_N = mkWN "Viramune" ; --UNCHK
@@ -54812,7 +54812,7 @@ lin usher_V2 = mkV2 "opastaa" partitive ;
lin usher_in_V2 = mkWV2 (k56A "alkaa") ; --UNCHK
lin usherette_N = mkWN (k10 "paikannäyttäjä") "naispuolinen" ; --UNCHK
lin usn_N = mkWN (k2 "laivasto") ; --UNCHK
lin ussr_N = mkWN (k1A "liitto") "Sosialististen" "neuvostotasavaltojen" ; --UNCHK
lin ussr_N = mkN "Neuvostoliitto" ; ---- cat N ??
lin usual_A = mkWA (k38 "tavallinen") ;
lin usually_Adv = mkAdv "tavallisesti" ;
lin usualness_N = mkWN (k40 "tavallisuus") ; --UNCHK
@@ -57779,7 +57779,7 @@ lin cupar_PN = foreignPN "Cupar" ;
lin curitiba_PN = foreignPN "Curitiba" ;
lin currie_PN = foreignPN "Currie" ;
lin cwmbran_PN = foreignPN "Cwmbran" ;
lin cyprus_PN = foreignPN "Kyproksen tasavalta" ;
lin cyprus_PN = foreignPN "Kypros" ;
lin cyril_PN = foreignPN "Cyril" ;
lin dakar_PN = foreignPN "Dakar" ;
lin dalkeith_PN = foreignPN "Dalkeith" ;

View File

@@ -13164,6 +13164,7 @@ lin neutralization_N = mkN "neutralisation" feminine ; -- tocheck
lin neutrino_N = mkN "neutrino" masculine ; -- tocheck
lin neutron_N = mkN "neutron" masculine ; -- tocheck
lin never_Adv = mkAdv "jamais" ;
lin never_AdV = lin AdV (ss "jamais") ;
lin nevertheless_Adv = mkAdv "néanmoins" ; -- tocheck
lin new_A = L.new_A ;
lin newborn_A = mkA "nouveau-né" ; -- tocheck
@@ -22869,7 +22870,7 @@ lin inverness_PN = mkPN "Inverness" ; -- status=guess src=geonames
lin inverurie_PN = mkPN "Inverurie" ; -- status=guess src=geonames
lin iowa_PN = mkPN "Iowa" ; -- status=guess src=geonames
lin ipswich_PN = mkPN "Ipswich" ; -- status=guess src=geonames
lin iran_PN = mkPN "Iran (République islamique de)" ; -- status=guess src=geonames
lin iran_PN = mkPN "Iran" ; -- status=guess src=geonames
lin iraq_PN = mkPN "Iraq" ; -- status=guess src=geonames
lin ireland_PN = mkPN "Irlande" ; -- status=guess src=geonames
lin irthlingborough_PN = mkPN "Irthlingborough" ; -- status=guess src=geonames
@@ -23543,7 +23544,7 @@ lin swinton_PN = mkPN "Swinton" ; -- status=guess src=geonames
lin switzerland_PN = mkPN "Suisse" ; -- status=guess src=geonames
lin sydney_PN = mkPN "Sydney" ; -- status=guess src=geonames
lin syracuse_PN = mkPN "Syracuse" ; -- status=guess src=geonames
lin syria_PN = mkPN "République arabe syrienne" ; -- status=guess src=geonames
lin syria_PN = mkPN "Syrie" ; -- status=guess src=geonames
lin syston_PN = mkPN "Syston" ; -- status=guess src=geonames
lin tadley_PN = mkPN "Tadley" ; -- status=guess src=geonames
lin taipei_PN = mkPN "Taipei" ; -- status=guess src=geonames
@@ -23583,7 +23584,7 @@ lin tim_PN = mkPN "Tim" ; -- status=guess src=geonames
lin tipperary_PN = mkPN "Tipperary" ; -- status=guess src=geonames
lin tiverton_PN = mkPN "Tiverton" ; -- status=guess src=geonames
lin todmorden_PN = mkPN "Todmorden" ; -- status=guess src=geonames
lin togo_PN = mkPN "République Togolaise" ; -- status=guess src=geonames
lin togo_PN = mkPN "Togo" ; -- status=guess src=geonames
lin tokyo_PN = mkPN "Tokyo" ; -- status=guess src=geonames
lin tonbridge_PN = mkPN "Tonbridge" ; -- status=guess src=geonames
lin tonga_PN = mkPN "Tonga" ; -- status=guess src=geonames

View File

@@ -30119,7 +30119,7 @@ lin ipso_facto_Adv = variants {};
lin ipswich_PN = mkPN "Ipswich"; -- src=geonames status=guess
lin iq_N = variants {};
lin ira_N = variants {};
lin iran_PN = mkPN "Iran (Islamische Republik)"; -- src=geonames status=guess
lin iran_PN = mkPN "Iran"; -- src=geonames status=guess
lin iranianFem_N = variants {};
lin iranianMasc_N = variants {};
lin iranian_A = variants {};
@@ -38025,7 +38025,7 @@ lin neutropenia_N = variants {};
lin neutrophil_N = variants {};
lin nevada_PN = mkPN "Nevada"; -- src=geonames status=guess
lin neve_N = variants {};
lin never_AdV = variants {};
lin never_AdV = lin AdV (ss "nie") ;
lin never_Adv = mkAdv "nie" ;
lin nevermore_Adv = variants {};
lin nevertheless_Adv = mkAdv "nichtsdestoweniger" | mkAdv "trotzdem" ; -- status=guess status=guess
@@ -57324,7 +57324,7 @@ lin taint_V2 = mkV2 (irregV "verderben" "verderbt" "verdarb" "verdürbe" "verdor
lin taintless_A = variants {};
lin taipan_N = mkN "Taipane" ; -- status=guess
lin taipei_PN = mkPN "Taipeh"; -- src=geonames status=guess
lin taiwan_PN = mkPN "Republik China"; -- src=geonames status=guess
lin taiwan_PN = mkPN "China"; -- src=geonames status=guess
lin taiwaneseFem_N = variants {};
lin taiwaneseMasc_N = variants {};
lin taiwanese_A = variants {};

View File

@@ -11312,6 +11312,7 @@ lin neutralization_N = mkN "neutralizzazione" feminine ; -- status=guess
lin neutrino_N = mkN "neutrino" ; -- status=guess
lin neutron_N = mkN "neutrone" masculine ; -- status=guess
lin never_Adv = mkAdv "mai" ;
lin never_AdV = lin AdV (ss "mai") ;
lin nevertheless_Adv = mkAdv "nondimeno" | mkAdv "tuttavia" | mkAdv "eppure" ; -- status=guess status=guess status=guess
lin new_A = L.new_A ;
lin newcomer_N = variants{} ; --
@@ -19300,7 +19301,7 @@ lin chesterfield_PN = mkPN "Chesterfield" ; -- status=guess src=geonames
lin chicago_PN = mkPN "Chicago" ; -- status=guess src=geonames
lin chichester_PN = mkPN "Chichester" ; -- status=guess src=geonames
lin chile_PN = mkPN "Cile" ; -- status=guess src=geonames
lin china_PN = mkPN "Repubblica Popolare Cinese" ; -- status=guess src=geonames
lin china_PN = mkPN "Cina" ; -- status=guess src=geonames
lin chippenham_PN = mkPN "Chippenham" ; -- status=guess src=geonames
lin chorley_PN = mkPN "Chorley" ; -- status=guess src=geonames
lin christchurch_PN = mkPN "Christchurch" ; -- status=guess src=geonames
@@ -19701,9 +19702,9 @@ lin inverness_PN = mkPN "Inverness" ; -- status=guess src=geonames
lin inverurie_PN = mkPN "Inverurie" ; -- status=guess src=geonames
lin iowa_PN = mkPN "Iowa" ; -- status=guess src=geonames
lin ipswich_PN = mkPN "Ipswich" ; -- status=guess src=geonames
lin iran_PN = mkPN "Iran (Repubblica Islamica)" ; -- status=guess src=geonames
lin iran_PN = mkPN "Iran" ; -- status=guess src=geonames
lin iraq_PN = mkPN "Iraq" ; -- status=guess src=geonames
lin ireland_PN = mkPN "Repubblica d'Irlanda" ; -- status=guess src=geonames
lin ireland_PN = mkPN "Irlanda" ; -- status=guess src=geonames
lin irthlingborough_PN = mkPN "Irthlingborough" ; -- status=guess src=geonames
lin irvine_PN = mkPN "Irvine" ; -- status=guess src=geonames
lin isabel_PN = mkPN "Isabel" ; -- status=guess src=geonames
@@ -19829,7 +19830,7 @@ lin lewes_PN = mkPN "Lewes" ; -- status=guess src=geonames
lin leyland_PN = mkPN "Leyland" ; -- status=guess src=geonames
lin lib_PN = mkPN "Lib" ; -- status=guess src=geonames
lin liberia_PN = mkPN "Liberia" ; -- status=guess src=geonames
lin libya_PN = mkPN "Libia, Repubblica Araba" ; -- status=guess src=geonames
lin libya_PN = mkPN "Libia" ; -- status=guess src=geonames
lin lichfield_PN = mkPN "Lichfield" ; -- status=guess src=geonames
lin liechtenstein_PN = mkPN "Principato del Liechtenstein" ; -- status=guess src=geonames
lin lilian_PN = mkPN "Lilian" ; -- status=guess src=geonames

View File

@@ -13559,6 +13559,7 @@ lin neutrality_N = mkN "neutralidad" feminine ; -- status=guess
lin neutralization_N = mkN "neutralización" feminine ; -- status=guess
lin neutrino_N = mkN "neutrino" ; -- status=guess
lin neutron_N = mkN "neutrón" ; -- status=guess
lin never_AdV = lin AdV (ss "nunca") | lin AdV (ss "jamás") ;
lin never_Adv = mkAdv "nunca" | mkAdv "jamás" ;
lin nevertheless_Adv = mkAdv "no obstante" | mkAdv "sin embargo" ;
lin new_A = L.new_A ;
@@ -22922,8 +22923,8 @@ lin chester_PN = mkPN "Chester" ; -- status=guess src=geonames
lin chesterfield_PN = mkPN "Chesterfield" ; -- status=guess src=geonames
lin chicago_PN = mkPN "Chicago" ; -- status=guess src=geonames
lin chichester_PN = mkPN "Chichester" ; -- status=guess src=geonames
lin chile_PN = mkPN "República de Chile" ; -- status=guess src=geonames
lin china_PN = mkPN ("China" | "República Popular China") ; -- status=guess src=geonames
lin chile_PN = mkPN "Chile" ; -- status=guess src=geonames
lin china_PN = mkPN "China" ; -- status=guess src=geonames
lin chippenham_PN = mkPN "Chippenham" ; -- status=guess src=geonames
lin chorley_PN = mkPN "Chorley" ; -- status=guess src=geonames
lin christchurch_PN = mkPN "Christchurch" ; -- status=guess src=geonames
@@ -22953,7 +22954,7 @@ lin coimbatore_PN = mkPN "Coimbatore" ; -- status=guess src=geonames
lin colchester_PN = mkPN "Colchester" ; -- status=guess src=geonames
lin colne_PN = mkPN "Colne" ; -- status=guess src=geonames
lin cologne_PN = mkPN "Cologne" ; -- status=guess src=geonames
lin colombia_PN = mkPN "República de Colombia" ; -- status=guess src=geonames
lin colombia_PN = mkPN "Colombia" ; -- status=guess src=geonames
lin colombo_PN = mkPN "Colombo" ; -- status=guess src=geonames
lin colorado_PN = mkPN "Colorado" ; -- status=guess src=geonames
lin columbia_PN = mkPN "Columbia" ; -- status=guess src=geonames
@@ -23315,15 +23316,15 @@ lin inverness_PN = mkPN "Inverness" ; -- status=guess src=geonames
lin inverurie_PN = mkPN "Inverurie" ; -- status=guess src=geonames
lin iowa_PN = mkPN "Iowa" ; -- status=guess src=geonames
lin ipswich_PN = mkPN "Ipswich" ; -- status=guess src=geonames
lin iran_PN = mkPN "Irán (República Islámica)" ; -- status=guess src=geonames
lin iran_PN = mkPN "Irán" ; -- status=guess src=geonames
lin iraq_PN = mkPN "Irak" ; -- status=guess src=geonames
lin ireland_PN = mkPN "República de Irlanda" ; -- status=guess src=geonames
lin ireland_PN = mkPN "Irlanda" ; -- status=guess src=geonames
lin irthlingborough_PN = mkPN "Irthlingborough" ; -- status=guess src=geonames
lin irvine_PN = mkPN "Irvine" ; -- status=guess src=geonames
lin isabel_PN = mkPN "Isabel" ; -- status=guess src=geonames
lin islington_PN = mkPN "Islington" ; -- status=guess src=geonames
lin israel_PN = mkPN "Israel" ; -- status=guess src=geonames
lin italy_PN = mkPN "República Italiana" ; -- status=guess src=geonames
lin italy_PN = mkPN "Italia" ; -- status=guess src=geonames
lin iver_PN = mkPN "Iver" ; -- status=guess src=geonames
lin jabalpur_PN = mkPN "Jabalpur" ; -- status=guess src=geonames
lin jacksonville_PN = mkPN "Jacksonville" ; -- status=guess src=geonames
@@ -23440,7 +23441,7 @@ lin lewes_PN = mkPN "Lewes" ; -- status=guess src=geonames
lin leyland_PN = mkPN "Leyland" ; -- status=guess src=geonames
lin lib_PN = mkPN "Lib" ; -- status=guess src=geonames
lin liberia_PN = mkPN "Liberia" ; -- status=guess src=geonames
lin libya_PN = mkPN "Libia, República Árabe" ; -- status=guess src=geonames
lin libya_PN = mkPN "Libia" ; -- status=guess src=geonames
lin lichfield_PN = mkPN "Lichfield" ; -- status=guess src=geonames
lin liechtenstein_PN = mkPN "Liechtenstein" ; -- status=guess src=geonames
lin lilian_PN = mkPN "Lilian" ; -- status=guess src=geonames
@@ -23484,7 +23485,7 @@ lin lubeck_PN = mkPN "Lubeck" ; -- status=guess src=geonames
lin lucknow_PN = mkPN "Lucknow" ; -- status=guess src=geonames
lin ludlow_PN = mkPN "Ludlow" ; -- status=guess src=geonames
lin luton_PN = mkPN "Luton" ; -- status=guess src=geonames
lin luxembourg_PN = mkPN ("Ciudad de Luxemburgo" | "Luxemburgo") ; -- status=guess src=geonames
lin luxembourg_PN = mkPN "Luxemburgo" ; -- status=guess src=geonames
lin lydney_PN = mkPN "Lydney" ; -- status=guess src=geonames
lin lymington_PN = mkPN "Lymington" ; -- status=guess src=geonames
lin lymm_PN = mkPN "Lymm" ; -- status=guess src=geonames
@@ -23495,7 +23496,7 @@ lin macclesfield_PN = mkPN "Macclesfield" ; -- status=guess src=geonames
lin mach_PN = mkPN "Mach" ; -- status=guess src=geonames
lin madagascar_PN = mkPN "Madagascar" ; -- status=guess src=geonames
lin madras_PN = mkPN "Madras" ; -- status=guess src=geonames
lin madrid_PN = mkPN "La Villa y Corte de Madrid" ; -- status=guess src=geonames
lin madrid_PN = mkPN "Madrid" ; -- status=guess src=geonames
lin madurai_PN = mkPN "Madurai" ; -- status=guess src=geonames
lin maesteg_PN = mkPN "Maesteg" ; -- status=guess src=geonames
lin magdeburg_PN = mkPN "Magdeburgo" ; -- status=guess src=geonames
@@ -23534,7 +23535,7 @@ lin maryport_PN = mkPN "Maryport" ; -- status=guess src=geonames
lin matlock_PN = mkPN "Matlock" ; -- status=guess src=geonames
lin maud_PN = mkPN "Maud" ; -- status=guess src=geonames
lin mauritania_PN = mkPN "Mauritania" ; -- status=guess src=geonames
lin mauritius_PN = mkPN "República de Mauricio" ; -- status=guess src=geonames
lin mauritius_PN = mkPN "Mauricio" ; -- status=guess src=geonames
lin mayfield_PN = mkPN "Mayfield" ; -- status=guess src=geonames
lin mayo_PN = mkPN "Mayo" ; -- status=guess src=geonames
lin mecca_PN = mkPN "La Meca" ; -- status=guess src=geonames
@@ -23717,7 +23718,7 @@ lin percy_PN = mkPN "Percy" ; -- status=guess src=geonames
lin perm_PN = mkPN "Perm" ; -- status=guess src=geonames
lin pershore_PN = mkPN "Pershore" ; -- status=guess src=geonames
lin perth_PN = mkPN "Perth" ; -- status=guess src=geonames
lin peru_PN = mkPN "República del Perú" ; -- status=guess src=geonames
lin peru_PN = mkPN "Perú" ; -- status=guess src=geonames
lin perugia_PN = mkPN "Perugia" ; -- status=guess src=geonames
lin pescara_PN = mkPN "Pescara" ; -- status=guess src=geonames
lin peterborough_PN = mkPN "Peterborough" ; -- status=guess src=geonames