diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 6c724d223..e1956d146 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -22445,7 +22445,8 @@ fun freddie_PN : PN ; fun freddy_PN : PN ; fun frederick_PN : PN ; -- 09094791 a town in northern Maryland to the west of Baltimore fun frederiksberg_PN : PN ; -fun free_A : A ; -- 01061489 able to act at will; not hampered; not under compulsion or restraint; "free enterprise"; "a free port"; "a free country"; "I have an hour free"; "free will"; "feel free to stay as long as you wish"; "a free choice" +fun free_1_A : A ; -- 01061489 able to act at will; not hampered; not under compulsion or restraint; "free enterprise"; "a free port"; "a free country"; "I have an hour free"; "free will"; "a free choice" +fun free_2_A : A ; -- 01710260 costing nothing; "free admission" fun free_N : N ; -- 07947958 people who are free; "the home of the free and the brave" fun free_V2 : V2 ; -- 02421374 grant freedom to; free from confinement fun free_V2V : V2V ; -- 02421374 grant freedom to; free from confinement @@ -48110,7 +48111,8 @@ fun roccella_N : N ; -- 12989007 a source of the dye archil and of fun rochdale_PN : PN ; fun rochester_PN : PN ; fun rock_'n_roll_N : N ; -fun rock_N : N ; -- 09416076 a lump or mass of hard consolidated mineral matter; "he threw a rock at me" +fun rock_1_N : N ; -- 09416076 a lump or mass of hard consolidated mineral matter; "he threw a rock at me" +fun rock_2_N : N ; -- 07064715 a genre of popular music originating in the 1950s; a blend of black rhythm-and-blues with white country-and-western; "rock is a generic term for the range of styles that evolved out of rock'n'roll." fun rock_V : V ; -- 01875295 move back and forth or sideways; "the ship was rocking"; "She rocked back and forth on her feet" fun rock_V2 : V2 ; -- 01876028 cause to move back and forth; "rock the cradle"; "rock the baby" fun rock_bottom_N : N ; diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index fcca99b9f..ba32a4bd4 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -22451,7 +22451,8 @@ lin freddie_PN = mkPN "Фреди" Masc ; lin freddy_PN = mkPN "Фреди" Masc ; lin frederick_PN = mkPN "Фредерик" Masc ; lin frederiksberg_PN = mkPN "Фредриксберг" Masc ; -lin free_A = mkA079 "свободен" ; +lin free_1_A = mkA079 "свободен" ; +lin free_2_A = mkA079 "безплатен" ; lin free_N = mkN033 "свободен" ; lin free_V2 = dirV2 (dualV (mkV186 "освобождавам") (mkV174 "освободя")) ; ---- lin free_V2V = mkV2V (dualV (mkV186 "освобождавам") (mkV174 "освободя")) noPrep noPrep ; @@ -24518,10 +24519,10 @@ lin gratify_V2 = variants {} ; lin gratifying_A = mkA079 "благодарен" ; ---- lin grating_N = mkN041 "решетка" ; ---- lin gratingly_Adv = variants {} ; -lin gratis_A = mkA079 "безплатен" ; ---- +lin gratis_A = mkA079 "безплатен" ; lin gratis_Adv = variants {} ; lin gratitude_N = mkN049 "благодарност" ; -lin gratuitous_A = variants {mkA079 "безкористен"; mkA079 "безплатен"; mkA079 "безпричинен"; mkA079 "произволен"} ; ---- +lin gratuitous_A = variants {mkA079 "безкористен"; mkA079 "безпричинен"; mkA079 "произволен"} ; ---- lin gratuity_N = mkN007 "бакшиш" ; lin grave_A = mkA079 "надгробен" ; lin grave_N = mkN001 "гроб" ; @@ -48150,7 +48151,8 @@ lin roccella_N = variants {} ; lin rochdale_PN = mkPN "Рочдейл" Masc ; lin rochester_PN = mkPN "Рочестър" Masc ; lin rock_'n_roll_N = variants {} ; -lin rock_N = mkN041 "скала" ; +lin rock_1_N = mkN041 "скала" ; +lin rock_2_N = mkN040a "рок" ; lin rock_V = variants {singleV (mkV186 "залюшкам"); singleV (mkV186 "кандилкам"); singleV (mkV173 "клатя"); singleV (mkV160 "люлея"); dualV (mkV186 "люшвам") (mkV152 "люшна"); singleV (mkV186 "люшкам"); dualV (mkV186 "поклащам") (mkV173 "поклатя"); singleV (mkV145a "треса")} ; ---- lin rock_V2 = dirV2 (dualV (mkV186 "разтърсвам") (mkV173 "разтърся")) ; ---- lin rock_bottom_N = variants {} ; diff --git a/lib/src/translator/DictionaryCat.gf b/lib/src/translator/DictionaryCat.gf index 6bb9032be..0b374cb53 100644 --- a/lib/src/translator/DictionaryCat.gf +++ b/lib/src/translator/DictionaryCat.gf @@ -6804,7 +6804,8 @@ lin fratricide_N = mkN "fratricidi" masculine ; --auto lin fraud_N = mkN "frau" masculine ; --auto lin fraudulence_N = mkN "fraudulència" feminine ; --auto lin fraudulent_A = mkA "fraudulent" ; --auto -lin free_A = mkA "lliure" ; +lin free_1_A = mkA "lliure" ; +lin free_2_A = mkA "lliure" ; lin free_V2 = mkV2 "alliberar" ; --auto lin free_up_V2 = prepV2 (lin V OP_free_V2) OP_up_Prep ; -- guess-p-verb lin freedom_N = mkN "llibertat" feminine ; --auto @@ -14166,7 +14167,8 @@ lin robotic_A = mkA "robòtic" ; --auto lin robotics_N = mkN "robòtica" feminine ; --auto lin robust_A = mkA "robust" ; --auto lin robustness_N = mkN "robustesa" feminine ; --auto -lin rock_N = L.rock_N ; +lin rock_1_N = L.rock_N ; +lin rock_2_N = L.rock_N ; lin rock_V = mkV "engrunsar" | mkV "gronxar" | mkV "sacsejar" ; --auto lin rock_V2 = mkV2 "engrunsar" | mkV2 "gronxar" | mkV2 "sacsejar" ; --auto lin rocket_N = mkN "coet" masculine ; --auto diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index d6e09f50a..0108d0b74 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -13780,7 +13780,8 @@ lin freddie_PN = foreignPN "Freddie" ; -- comment=src=eng status=guess lin freddy_PN = foreignPN "Freddy" ; -- comment=src=eng status=guess lin frederick_PN = mkPN "弗雷德里克" ; -- comment=src=geonames status=guess lin frederiksberg_PN = mkPN "腓特烈斯贝" ; -- comment=src=geonames status=guess -lin free_A = mkA "免费" | mkA "自由" | {-HSK-} mkA "无偿" ; +lin free_1_A = mkA "免费" | mkA "自由" | {-HSK-} mkA "无偿" ; +lin free_2_A = mkA "免费" | mkA "自由" | {-HSK-} mkA "无偿" ; lin free_N = mkN "免费" | mkN "自由" "個" | {-HSK-} mkN "自由軟件" | mkN "自由软件" ; -- status=guess -- status=guess lin free_V2 = mkV2 "免费" | {-HSK-} mkV2 "放" ; lin free_V2V = mkV2V "免费" | {-HSK-} mkV2V "放" ; @@ -28060,7 +28061,8 @@ lin robust_A = mkA "健壮" ; lin roc_N = mkN "鹏" | mkN "大鹏" ; -- status=guess -- status=guess lin rochdale_PN = foreignPN "Rochdale" ; -- comment=src=geonames status=guess lin rochester_PN = mkPN "羅徹斯特" ; -- comment=src=geonames status=guess -lin rock_N = L.rock_N ; +lin rock_1_N = L.rock_N ; +lin rock_2_N = L.rock_N ; lin rock_V = mkV "摇" | {-HSK-} mkV "摇晃" ; lin rock_V2 = mkV2 "摇" | {-HSK-} mkV2 "摇动" ; lin rocker_N = mkN "摇杆" ; diff --git a/lib/src/translator/DictionaryDut.gf b/lib/src/translator/DictionaryDut.gf index bb6053bb1..fae52197a 100644 --- a/lib/src/translator/DictionaryDut.gf +++ b/lib/src/translator/DictionaryDut.gf @@ -8231,7 +8231,8 @@ lin freddie_PN = mkPN "Freddie" ; -- src=eng status=guess lin freddy_PN = mkPN "Freddy" ; -- src=eng status=guess lin frederick_PN = mkPN "Frederick" ; -- src=geonames status=guess lin frederiksberg_PN = mkPN "Frederiksberg" ; -- src=geonames status=guess -lin free_A = mkA "vrij" | mkA "los" ; +lin free_1_A = mkA "vrij" | mkA "los" ; +lin free_2_A = mkA "vrij" | mkA "los" ; lin free_N = mkN "vrije trap" masculine | mkN "vrije schop" masculine | mkN "vrijschop" masculine ; -- status=guess status=guess status=guess lin free_V2 = mkV2 (mkV "bevrijden") | mkV2 (mkV "loslaten") | mkV2 (mkV (mkV "laten") "gaan") ; -- status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt lin free_V2V = mkV2V (mkV "bevrijden") | mkV2V (mkV "loslaten") | mkV2V (mkV (mkV "laten") "gaan") ; -- status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt @@ -17393,7 +17394,8 @@ lin robot_N = mkN "robot" ; -- status=guess lin robust_A = mkA "robuust" | mkA "degelijk" ; -- status=guess status=guess lin rochdale_PN = mkPN "Rochdale" ; -- src=geonames status=guess lin rochester_PN = mkPN "Rochester" ; -- src=geonames status=guess -lin rock_N = L.rock_N ; +lin rock_1_N = L.rock_N ; +lin rock_2_N = L.rock_N ; lin rock_V = mkV "schudden" ; -- status=guess, src=wikt lin rock_V2 = mkV2 (mkV "schudden") ; -- status=guess, src=wikt lin rocket_N = mkN "raket" ; -- status=guess diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index 5fd556f4d..06e114a42 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -22547,7 +22547,8 @@ lin freddie_PN = mkPN "Freddie"; lin freddy_PN = mkPN "Freddy"; lin frederick_PN = mkPN "Frederick"; lin frederiksberg_PN = mkPN "Frederiksberg"; -lin free_A = mkA "free" "freer"; +lin free_1_A = mkA "free" "freer"; +lin free_2_A = mkA "free" "freer"; lin free_N = mkN "free" ; lin free_V2 = mkV2 (mkV "free" "frees" "freed" "freed" "freeing"); lin free_V2V = mkV2V (mkV "free") noPrep to_Prep ; @@ -48325,7 +48326,8 @@ lin roccella_N = mkN "roccella" ; lin rochdale_PN = mkPN "Rochdale"; lin rochester_PN = mkPN "Rochester"; lin rock_'n_roll_N = mkN "rock-'n-roll" ; -lin rock_N = mkN "rock" "rocks"; +lin rock_1_N = mkN "rock" "rocks"; +lin rock_2_N = mkN "rock" "rocks"; lin rock_V = mkV "rock" "rocks" "rocked" "rocked" "rocking"; lin rock_V2 = mkV2 (mkV "rock" "rocks" "rocked" "rocked" "rocking"); lin rock_bottom_N = mkN "rock-bottom" ; diff --git a/lib/src/translator/DictionaryEst.gf b/lib/src/translator/DictionaryEst.gf index 1837161eb..c7a66e484 100644 --- a/lib/src/translator/DictionaryEst.gf +++ b/lib/src/translator/DictionaryEst.gf @@ -13096,7 +13096,8 @@ lin freak_N = D.ebard_N ; lin freakish_A = D.ebardlik_A ; lin freakishness_N = mkN "ebardlikkus" ; lin freckle_N = D.'tedretähn_N' ; -lin free_A = D.sundimatu_A ; +lin free_1_A = D.sundimatu_A ; +lin free_2_A = D.sundimatu_A ; lin free_N = mkN "sundimatu" ; lin free_V2 = D.vabastama_V2 ; lin free_V2V = mkV2V "vabastama" ; @@ -25071,7 +25072,8 @@ lin robin_N = D.punarind_N ; lin robot_N = D.robot_N ; lin robotics_N = D.robootika_N ; lin robust_A = D.'jõuline_A' ; -lin rock_N = L.rock_N ; +lin rock_1_N = L.rock_N ; +lin rock_2_N = L.rock_N ; lin rock_V = mkV "kiigutama" ; lin rock_V2 = D.kiigutama_V2 ; lin rock_bottom_N = mkN "aluskalju" ; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index ea37eaa96..71a105344 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -20803,7 +20803,8 @@ lin freckle_V2 = mkWV2 "pisamoitua" ; --UNCHK lin freckleton_PN = foreignPN "Freckleton" ; lin frederick_PN = foreignPN "Frederick" ; lin frederiksberg_PN = foreignPN "Frederiksberg" ; -lin free_A = mkA "vapaa" ; +lin free_1_A = mkA "vapaa" ; +lin free_2_A = mkA "vapaa" ; lin free_N = mkWN (compoundN "kylä" (k38 "pöllönen")) ; --UNCHK lin free_V2 = mkWV2 (k53A "vapauttaa") ; --UNCHK lin free_V2V = mkWV2V (k53A "vapauttaa") ; --UNCHK @@ -44510,7 +44511,8 @@ lin roc_N = mkWN (compoundN "rok-" (k1A "lintu")) ; --UNCHK lin roccella_N = mkWN "Roccella" "tinctoria" ; --UNCHK lin rochdale_PN = foreignPN "Rochdale" ; lin rochester_PN = foreignPN "Rochester" ; -lin rock_N = L.rock_N ; +lin rock_1_N = L.rock_N ; +lin rock_2_N = L.rock_N ; lin rock_V = mkWV (k52A "keikkua") ; --UNCHK lin rock_V2 = mkWV2 (k52A "keikkua") ; --UNCHK lin rock_bottom_N = mkWN (k10 "pohja") ; --UNCHK diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index bc37089c9..cb96616b1 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -12204,7 +12204,8 @@ lin freckle_N = mkN "tache_de_rousseur" | mkN "éphélide" ; -- UWN lin freckleton_PN = mkPN "Freckleton" ; -- status=guess src=geonames lin frederick_PN = mkPN "Frederick" ; -- status=guess src=geonames lin frederiksberg_PN = mkPN "Frederiksberg" ; -- status=guess src=geonames -lin free_A = mkA "libre" | mkA "gratuit" ; ---- split: free world, free lunch +lin free_1_A = mkA "libre" ; +lin free_2_A = mkA "gratuit" ; lin free_V2 = variants {} ; -- mkV2V (mkV "libérer") ; -- tocheck lin free_V2V = mkV2V (mkV "libérer") ; -- tocheck lin free_for_all_N = mkN "pagaille" feminine ; -- tocheck @@ -25492,7 +25493,8 @@ lin robotics_N = mkN "robotique" ; -- UWN lin robustness_N = mkN "robustesse" feminine ; -- tocheck lin rochdale_PN = mkPN "Rochdale" ; -- status=guess src=geonames lin rochester_PN = mkPN "Rochester" ; -- status=guess src=geonames -lin rock_N = L.rock_N ; +lin rock_1_N = L.rock_N ; +lin rock_2_N = L.rock_N ; lin rock_V = variants {} ; -- mkV2 (mkV "secouer") | mkV2 (mkV "remuer") | mkV2 (mkV "gérer") ; -- tocheck lin rock_V2 = mkV2 (mkV "secouer") | mkV2 (mkV "remuer") | mkV2 (mkV "gérer") ; -- tocheck lin rockabilly_N = mkN "Rockabilly" | mkN "hillbilly_rock" | mkN "rockabilly" ; -- UWN diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index 7feeb37cb..c25dd801e 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -22447,7 +22447,8 @@ lin freddie_PN = mkPN "Freddie" ; -- src=eng status=guess lin freddy_PN = mkPN "Freddy" ; -- src=eng status=guess lin frederick_PN = mkPN "Frederick" ; -- src=geonames status=guess lin frederiksberg_PN = mkPN "Frederiksberg Kommune" ; -- src=geonames status=guess -lin free_A = mkA "frei" ; +lin free_1_A = mkA "frei" ; +lin free_2_A = mkA "frei" ; lin free_N = mkN "Freistoß" "Freistöße" masculine ; -- status=guess lin free_V2 = mkV2 (regV "befreien" | regV "freisetzen") ; -- status=guess, src=wikt status=guess, src=wikt lin free_V2V = mkV2V (regV "befreien" | regV "freisetzen") ; -- status=guess, src=wikt status=guess, src=wikt @@ -48085,7 +48086,8 @@ lin roccella_N = variants {} ; lin rochdale_PN = mkPN "Rochdale" ; -- src=geonames status=guess lin rochester_PN = mkPN "Rochester" ; -- src=geonames status=guess lin rock_'n_roll_N = variants {} ; -lin rock_N = L.rock_N ; +lin rock_1_N = L.rock_N ; +lin rock_2_N = L.rock_N ; lin rock_V = mkV "auwühlen" | regV "schockieren" ; -- status=guess, src=wikt status=guess, src=wikt lin rock_V2 = mkV2 (mkV "auwühlen" | regV "schockieren") ; -- status=guess, src=wikt status=guess, src=wikt lin rock_bottom_N = variants {} ; diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index 1d4b0db56..c4f6fb32f 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -10625,7 +10625,8 @@ lin freakishness_N = mkN "सनकीपन" ; -- tocheck lin freckle_N = mkN "चित्ती" ; -- tocheck lin freckle_V = compoundV "चित्ती" (mkV "पड़ना") ; -- tocheck lin freckle_V2 = mkV2 (compoundV "चित्ती" (mkV "पड़ना")) ; -- tocheck -lin free_A = mkA "असंयोजित" ; -- tocheck +lin free_1_A = mkA "असंयोजित" ; -- tocheck +lin free_2_A = mkA "असंयोजित" ; -- tocheck lin free_V2 = mkV2 (compoundV "उद्धार" (mkV "करना")) ; -- tocheck lin free_and_easy_A = mkA "प्रसन्न एवं चिंतारहित" ; -- tocheck lin freehand_A = mkA "मुक्तहस्त" ; -- tocheck @@ -23092,7 +23093,8 @@ lin robotic_A = mkA "यंत्रमानववत्" ; -- tocheck lin robotics_N = mkN "यंत्रमानवशास्त्र" ; -- tocheck lin robust_A = mkA "ज़बर्दस्त" ; -- tocheck lin robustness_N = mkN "मजबूती" ; -- tocheck -lin rock_N = mkN "चट्टान" ; -- tocheck +lin rock_1_N = mkN "चट्टान" ; -- tocheck +lin rock_2_N = mkN "चट्टान" ; -- tocheck lin rock_V = mkV "हिलाना" ; -- tocheck lin rock_V2 = mkV2 (mkV "हिलाना") ; -- tocheck lin rock_garden_N = mkN "शैलोद्यान" ; -- tocheck diff --git a/lib/src/translator/DictionaryIta.gf b/lib/src/translator/DictionaryIta.gf index cf2f1d78b..3ace9b1ea 100644 --- a/lib/src/translator/DictionaryIta.gf +++ b/lib/src/translator/DictionaryIta.gf @@ -10863,7 +10863,8 @@ lin freckle_N = mkN "lentiggine" ; -- status=guess lin freckleton_PN = mkPN "Freckleton" ; -- status=guess src=geonames lin frederick_PN = mkPN "Frederick" ; -- status=guess src=geonames lin frederiksberg_PN = mkPN "Frederiksberg" ; -- status=guess src=geonames -lin free_A = mkA "libero" ; -- status=guess +lin free_1_A = mkA "libero" ; -- status=guess +lin free_2_A = mkA "libero" ; -- status=guess lin free_N = mkN "calcio di punizione" feminine ; -- status=guess lin free_V2 = mkV2 (mkV "liberare") ; -- status=guess, src=wikt lin free_V2V = mkV2V (mkV "liberare") ; -- status=guess, src=wikt @@ -22717,7 +22718,8 @@ lin robot_N = mkN "robot" masculine ; -- status=guess lin robotics_N = mkN "robotica" ; -- UWN lin rochdale_PN = mkPN "Rochdale" ; -- status=guess src=geonames lin rochester_PN = mkPN "Rochester" ; -- status=guess src=geonames -lin rock_N = L.rock_N ; +lin rock_1_N = L.rock_N ; +lin rock_2_N = L.rock_N ; lin rock_V = mkV "cullare" ; -- status=guess, src=wikt lin rock_V2 = mkV2 (mkV "cullare") ; -- status=guess, src=wikt lin rocker_N = mkN "sedia a dondolo" ; -- status=guess diff --git a/lib/src/translator/DictionaryJpn.gf b/lib/src/translator/DictionaryJpn.gf index ed870900d..860eaf50b 100644 --- a/lib/src/translator/DictionaryJpn.gf +++ b/lib/src/translator/DictionaryJpn.gf @@ -6009,7 +6009,8 @@ lin freak_N = mkN "フリーク" | mkN "変人" ; lin freak_V = mkV "フリークアウトする" ; lin freak_V2 = mkV2 "フリークアウトする" ; lin freckle_N = mkN "雀斑" | mkN "そばかす" ; -lin free_A = mkA "自由" ; +lin free_1_A = mkA "自由" ; +lin free_2_A = mkA "自由" ; lin free_N = mkN "自由間接話法" ; lin free_V2 = mkV2 "解放する" ; lin free_V2V = mkV2V "解放する" ; @@ -12494,7 +12495,8 @@ lin robber_N = mkN "盗賊" | mkN "強盗" ; lin robbery_N = mkN "強盗" ; lin robin_N = mkN "コマツグミ" ; lin robot_N = mkN "ロボット" | mkN "人造人間" ; -lin rock_N = L.rock_N | mkN "ロックンロール" ; +lin rock_1_N = L.rock_N | mkN "ロックンロール" ; +lin rock_2_N = L.rock_N | mkN "ロックンロール" ; lin rock_V = variants {} ; -- lin rock_V2 = variants {} ; -- lin rocket_N = mkN "打ち上げ花火" ; diff --git a/lib/src/translator/DictionaryMlt.gf b/lib/src/translator/DictionaryMlt.gf index 7e07e671f..62bcfd78d 100644 --- a/lib/src/translator/DictionaryMlt.gf +++ b/lib/src/translator/DictionaryMlt.gf @@ -361,7 +361,8 @@ lin restaurant_N = mkN "restorant" "restoranti" ; lin right_Ord = mkOrd "lemin" ; lin river_N = mkN "xmara" "xmajjar" ; lin road_N = mkN "triq" "triqat" "toroq" feminine ; -lin rock_N = mkNColl "blata" "blat" "blatiet" ; +lin rock_1_N = mkNColl "blata" "blat" "blatiet" ; +lin rock_2_N = mkNColl "blata" "blat" "blatiet" ; lin roof_N = mkN "saqaf" "soqfa" ; lin root_N = mkN "qħerq" "qħeruq" ; lin rope_N = mkN "ħabel" "ħbula" ; diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index f1f251024..af52c575e 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -12083,7 +12083,8 @@ lin freckle_V2 = mkV2 (mkV (mkV "tener") "peca") ; -- status=guess, src=wikt lin freckleton_PN = mkPN "Freckleton" ; -- status=guess src=geonames lin frederick_PN = mkPN "Frederick" ; -- status=guess src=geonames lin frederiksberg_PN = mkPN "Frederiksberg" ; -- status=guess src=geonames -lin free_A = mkA "libre" ; +lin free_1_A = mkA "libre" ; +lin free_2_A = mkA "libre" ; lin free_N = mkN "carta blanca" | mkN "manos libres" ; -- status=guess status=guess lin free_V2 = mkV2 (mkV "librar") ; -- status=guess lin free_V2V = mkV2V (mkV "librar") ; -- status=guess @@ -25077,7 +25078,8 @@ lin robotics_N = mkN "robótica" ; -- status=guess lin robust_A = mkA "robusto" ; -- status=guess lin rochdale_PN = mkPN "Rochdale" ; -- status=guess src=geonames lin rochester_PN = mkPN "Rochester" ; -- status=guess src=geonames -lin rock_N = L.rock_N ; +lin rock_1_N = L.rock_N ; +lin rock_2_N = L.rock_N ; lin rock_V = mecer_V ; -- status=guess lin rock_V2 = mkV2 (mecer_V) ; -- status=guess lin rockabilly_N = mkN "rockabilly" ; --UWN diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 6bbd5b679..3242280ae 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -12227,7 +12227,7 @@ lin congolese_A = variants {} ; -- status=guess lin congolese_N = variants {} ; -- status=guess lin congou_N = variants {} ; -- status=guess lin congratulate_V2 = mkV2 (mkV "gratulerar") | mkV2 (mkV "lyckönska") | mkV2 (mkV "grattar") ; -lin congratulation_N = mkN "gratulation" "gratulationer" | mkN "grattis" "grattis" ; +lin congratulation_N = mkN "gratulation" "gratulationer" ; lin congratulatory_A = variants {} ; -- status=guess lin congregant_N = variants {} ; -- status=guess lin congregate_V = mkV "samlar" ; -- comment=2 @@ -22324,7 +22324,8 @@ lin freddie_PN = mkPN "Freddie" ; -- src=eng status=guess lin freddy_PN = mkPN "Freddy" ; -- src=eng status=guess lin frederick_PN = mkPN "Frederick" neutrum ; -- src=geonames status=guess lin frederiksberg_PN = mkPN "Frederiksberg" neutrum ; -- src=geonames status=guess -lin free_A = mkA "ledig" | mkA "fri" "fritt" ; +lin free_1_A = mkA "ledig" | mkA "fri" "fritt" ; +lin free_2_A = mkA "kostnadsfri" "kostnadsfritt" ; lin free_N = mkN "fritt kassaflöde" ; -- status=guess lin free_V2 = mkV2 (mkV "frigöra" "frigjorde" "frigjort") | mkV2 (mkV "befriar") | mkV2 (mkV "frita" "fritar" "frita" "fritog" "fritagit" "fritagen") ; -- status=guess lin free_V2V = mkV2V (mkV "befriar") ; -- status=guess @@ -24361,7 +24362,7 @@ lin gratify_V2 = variants {} ; -- status=guess lin gratifying_A = mkA "glädjande" ; -- comment=2 lin grating_N = mkN "gnisslande" ; -- comment=5 lin gratingly_Adv = variants {} ; -- status=guess -lin gratis_A = mkA "kostnadsfri" "kostnadsfritt" ; -- comment=2 +lin gratis_A = mkA "gratis" ; lin gratis_Adv = mkAdv "gratis" ; -- status=guess lin gratitude_N = mkN "tacksamhet" "tacksamheter" ; -- status=guess lin gratuitous_A = compoundA (regA "ogrundad") ; -- comment=4 @@ -47796,7 +47797,8 @@ lin roccella_N = variants {} ; -- status=guess lin rochdale_PN = mkPN "Rochdale" neutrum ; -- src=geonames status=guess lin rochester_PN = mkPN "Rochester" neutrum ; -- src=geonames status=guess lin rock_'n_roll_N = variants {} ; -- status=guess -lin rock_N = L.rock_N ; +lin rock_1_N = L.rock_N ; +lin rock_2_N = mkN "rock" ; lin rock_V = mkV "vaggar" ; -- comment=9 lin rock_V2 = dirV2 (partV (mkV "skakar")"om") ; -- comment=2 lin rock_bottom_N = variants {} ; -- status=guess diff --git a/lib/src/translator/DictionaryTha.gf b/lib/src/translator/DictionaryTha.gf index 92bdf36ea..9042905c5 100644 --- a/lib/src/translator/DictionaryTha.gf +++ b/lib/src/translator/DictionaryTha.gf @@ -15367,7 +15367,8 @@ lin freakish_A = mkA "นอกทาง" | mkA "นอกลู่" | mkA "ว lin freckle_N = mkN "กระ" | mkN "กระ" | mkN "ตกกระ" ; -- src=panlex lin freckle_V = mkV "เป็นกระ" | mkV "ทำให้เป็นกระ" | mkV "มีกระ" | mkV "เป็นกระ" | mkV "ทําให้เป็นกระ" ; -- src=panlex lin freckle_V2 = mkV2 "เป็นกระ" ; ---- | mkV "ทำให้เป็นกระ" | mkV "มีกระ" | mkV "เป็นกระ" | mkV "ทําให้เป็นกระ" ; -- src=panlex -lin free_A = mkA "อิสระ" | mkA "แจกฟรี" | mkA "โดยเสรี" | mkA "ให้เปล่า" | mkA "ไม่คิดมูลค่า" | mkA "ซึ่งเป็นอิสระ" | mkA "ไม่มีข้อจํากัด" ; -- src=panlex +lin free_1_A = mkA "อิสระ" | mkA "แจกฟรี" | mkA "โดยเสรี" | mkA "ให้เปล่า" | mkA "ไม่คิดมูลค่า" | mkA "ซึ่งเป็นอิสระ" | mkA "ไม่มีข้อจํากัด" ; -- src=panlex +lin free_2_A = mkA "อิสระ" | mkA "แจกฟรี" | mkA "โดยเสรี" | mkA "ให้เปล่า" | mkA "ไม่คิดมูลค่า" | mkA "ซึ่งเป็นอิสระ" | mkA "ไม่มีข้อจํากัด" ; -- src=panlex lin free_N = mkN "ผู้เป็นอิสระ" ; -- src=panlex lin free_up_V2 = prepV2 (lin V OP_free_V2) OP_up_Prep ; -- guess-p-verb lin freebie_N = mkN "ของฟรี" | mkN "ของแจกฟรี" | mkN "สิ่งที่ให้ฟรี" | mkN "สิ่งที่ให้โดยไม่คิดเงิน" ; -- src=panlex @@ -32660,7 +32661,8 @@ lin robotics_N = mkN "โรโบติกส์" | mkN "วิทยากา lin robust_A = mkA "หยาบ" | mkA "ทนทาน" | mkA "เอะอะ" | mkA "กํายํา" | mkA "เถรตรง" | mkA "แข็งแรง" | mkA "แน่วแน่" | mkA "มุ่งมั่น" | mkA "เข้มแข็ง" | mkA "แข็งแกร่ง" | mkA "ตรงไปตรงมา" | mkA "มีกําลังมาก" | mkA "หยาบกระด้าง" | mkA "อุดมสมบูรณ์" | mkA "เอางานเอาการ" | mkA "กํายําสมบูรณ์" | mkA "เอาจริงเอาจัง" | mkA "ที่ใช้กําลังมาก" ; -- src=panlex lin robustness_N = mkN "ความแข็งแรง" | mkN "ความเเข็งแรง" | mkN "ความแข็งแกร่ง" ; -- src=panlex lin roc_N = mkN "นกยักษ์ร็อก" ; -- src=panlex -lin rock_N = mkN "หิน" | {-pan-} mkN "ศิลา" | mkN "หินผา" | mkN "ก้อนหิน" | mkN "เพลงร็อก" | mkN "ความเอียง" | mkN "ดนตรีร็อก" | mkN "ร็อกแคนดี้" | mkN "การแกล้งทำเป็น" | mkN "เพลงร็อกแอนด์โรล" | mkN "ดนตรีร็อกแอนด์โรล" | mkN "ไกว" | mkN "เพชร" | mkN "เขย่า" | mkN "แกว่ง" | mkN "การโยก" | mkN "โขดหิน" | mkN "ก้อนหิน" | mkN "ร่อนแร่" | mkN "อันตราย" | mkN "การเขย่า" | mkN "การแกว่ง" | mkN "เพชรพลอย" | mkN "โคลงเคลง" | mkN "ดนตรีร็อค" | mkN "ภัยพิบัติ" | mkN "หินโสโครก" | mkN "รากฐานอันมั่นคง" | mkN "ทําให้สั่นสะเทือน" | mkN "ลูกกวาดที่เป็นแท่งแข็งมีหลากสี" ; -- src=panlex ----? +lin rock_1_N = mkN "หิน" | {-pan-} mkN "ศิลา" | mkN "หินผา" | mkN "ก้อนหิน" | mkN "เพลงร็อก" | mkN "ความเอียง" | mkN "ดนตรีร็อก" | mkN "ร็อกแคนดี้" | mkN "การแกล้งทำเป็น" | mkN "เพลงร็อกแอนด์โรล" | mkN "ดนตรีร็อกแอนด์โรล" | mkN "ไกว" | mkN "เพชร" | mkN "เขย่า" | mkN "แกว่ง" | mkN "การโยก" | mkN "โขดหิน" | mkN "ก้อนหิน" | mkN "ร่อนแร่" | mkN "อันตราย" | mkN "การเขย่า" | mkN "การแกว่ง" | mkN "เพชรพลอย" | mkN "โคลงเคลง" | mkN "ดนตรีร็อค" | mkN "ภัยพิบัติ" | mkN "หินโสโครก" | mkN "รากฐานอันมั่นคง" | mkN "ทําให้สั่นสะเทือน" | mkN "ลูกกวาดที่เป็นแท่งแข็งมีหลากสี" ; -- src=panlex ----? +lin rock_2_N = mkN "หิน" | {-pan-} mkN "ศิลา" | mkN "หินผา" | mkN "ก้อนหิน" | mkN "เพลงร็อก" | mkN "ความเอียง" | mkN "ดนตรีร็อก" | mkN "ร็อกแคนดี้" | mkN "การแกล้งทำเป็น" | mkN "เพลงร็อกแอนด์โรล" | mkN "ดนตรีร็อกแอนด์โรล" | mkN "ไกว" | mkN "เพชร" | mkN "เขย่า" | mkN "แกว่ง" | mkN "การโยก" | mkN "โขดหิน" | mkN "ก้อนหิน" | mkN "ร่อนแร่" | mkN "อันตราย" | mkN "การเขย่า" | mkN "การแกว่ง" | mkN "เพชรพลอย" | mkN "โคลงเคลง" | mkN "ดนตรีร็อค" | mkN "ภัยพิบัติ" | mkN "หินโสโครก" | mkN "รากฐานอันมั่นคง" | mkN "ทําให้สั่นสะเทือน" | mkN "ลูกกวาดที่เป็นแท่งแข็งมีหลากสี" ; -- src=panlex ----? lin rock_V = mkV "โยก" | mkV "ไกว" | mkV "โคลง" | mkV "แกว่ง" | mkV "โยกเยก" | mkV "แกว่งไกว" | mkV "โคลงเคลง" | mkV "แกว่งไปแกว่งมา" | mkV "โยก" | mkV "โล้" | mkV "เขย่า" | mkV "แกว่ง" | mkV "ทําให้ตกใจ" | mkV "ทําให้สั่นสะเทือน" ; -- src=panlex lin rock_V2 = mkV2 "โยก" ; ---- | mkV "ไกว" | mkV "โคลง" | mkV "แกว่ง" | mkV "โยกเยก" | mkV "แกว่งไกว" | mkV "โคลงเคลง" | mkV "แกว่งไปแกว่งมา" | mkV "โยก" | mkV "โล้" | mkV "เขย่า" | mkV "แกว่ง" | mkV "ทําให้ตกใจ" | mkV "ทําให้สั่นสะเทือน" ; -- src=panlex lin rockabilly_N = mkN "ร็อกคาบิลลี่" ; -- src=panlex diff --git a/lib/src/translator/translate.probs b/lib/src/translator/translate.probs index e6cf2e264..313950d25 100644 --- a/lib/src/translator/translate.probs +++ b/lib/src/translator/translate.probs @@ -22567,7 +22567,7 @@ freddie_PN 1.865462821325971e-5 freddy_PN 1.865462821325971e-5 frederick_PN 1.865462821325971e-5 frederiksberg_PN 1.865462821325971e-5 -free_A 1.5190200704566757e-3 +free_1_A 1.5190200704566757e-3 free_N 3.729715012475897e-6 free_V2 3.702690084839899e-4 free_V2V 1.402524544179523e-3 @@ -48123,7 +48123,7 @@ roccella_N 3.729715012475897e-6 rochdale_PN 1.865462821325971e-5 rochester_PN 1.865462821325971e-5 rock_'n_roll_N 3.729715012475897e-6 -rock_N 8.205373027446973e-5 +rock_1_N 8.205373027446973e-5 rock_V 1.5875175760874494e-4 rock_V2 8.049326271391085e-5 rock_bottom_N 3.729715012475897e-6