diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index 05f5f528b..7dbe52891 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -1,7 +1,7 @@ --# -path=.:../german:../abstract:../common concrete DictionaryGer of Dictionary = CatGer ** open ParadigmsGer, (S = StructuralGer), - IrregGer, (R = ResGer), (M = MorphoGer), Prelude in { + IrregGer, (R = ResGer), (M = MorphoGer), (I = IrregGer), Prelude in { flags coding=utf8 ; @@ -1167,7 +1167,7 @@ lin amsterdam_PN = variants {}; lin amuck_Adv = variants {}; lin amulet_N = reg2N "Amulett" "Amulette" neuter; lin amuse_V2 = dirV2 (irregV "amüsieren" "amüsiert" "amüsierte" "amüsierte" "amüsiert"); -lin amusement_N = variants {}; +lin amusement_N = mkN "Vergnügung" "Vergnügung" feminine ; lin amusing_A = variants {}; lin amy_PN = variants {}; lin anachronism_N = reg2N "Anachronismus" "Anachronismen" masculine; @@ -5925,7 +5925,7 @@ lin chaw_N = variants {}; lin chaw_V2 = variants {}; lin chaw_bacon_N = variants {}; lin cheadle_PN = variants {}; -lin cheap_A = variants {}; +lin cheap_A = mkA "billig" ; lin cheapen_V = variants {}; lin cheapen_V2 = variants {}; lin cheapjack_A = variants {}; @@ -6604,6 +6604,7 @@ lin close_fitting_A = variants {}; lin close_grained_A = variants {}; lin close_hauled_A = variants {}; lin close_set_A = variants {}; +lin closed_A = mkA "geschlossen" ; lin close_up_N = variants {}; lin closeness_N = variants {}; lin closet_A = variants {}; @@ -8088,8 +8089,8 @@ lin cosmopolitan_N = variants {}; lin cosmos_N = variants {}; lin cosset_V2 = variants {}; lin cost_N = reg2N "Verlust" "Verluste" masculine; -lin cost_V = variants {}; -lin cost_V2 = variants {}; +lin cost_V = mkV "kosten" ; +lin cost_V2 = mkV2 (mkV "kosten") ; lin costa_rica_PN = variants {}; lin costa_rican_A = variants {}; lin costa_rican_N = variants {}; @@ -12794,7 +12795,7 @@ lin expend_V2 = variants {}; lin expendable_A = variants {}; lin expenditure_N = variants {}; lin expense_N = reg2N "Verlust" "Verluste" masculine; -lin expensive_A = variants {}; +lin expensive_A = mkA "teuer" ; lin experience_N = mkN "Erfahrung"; lin experience_V2 = variants {}; lin experienced_A = variants {}; @@ -14542,7 +14543,7 @@ lin freight_V2 = variants {}; lin freight_train_N = variants {}; lin freighter_N = variants {}; lin freighter_N = variants {}; -lin french_A = variants {}; +lin french_A = mkA "französisch" ; lin french_N = variants {}; lin frenchman_N = variants {}; lin frenchwoman_N = variants {}; @@ -17556,7 +17557,7 @@ lin hover_V = regV "schweben"; lin hovercraft_N = variants {}; lin how_IAdv = ss "wie"; lin how8many_IDet = {s = \\g,c => (M.detLikeAdj False R.Pl "wieviel").s ! g ! R.NPC c ; n = R.Pl}; -lin how8much_IDet = variants {}; +lin how8much_IDet = {s = \\g,c => (M.detLikeAdj False R.Sg "wieviel").s ! g ! R.NPC c ; n = R.Sg}; lin how_d'ye_do_N = variants {}; lin howard_PN = variants {}; lin howdah_N = variants {}; @@ -20189,7 +20190,7 @@ lin know_V = irregV "erkennen" "erkennt" "erkannte" "erkannte" "erkannt" ; lin know_V2 = dirV2 (irregV "kennen" "kennt" "kannte" "kännte" "gekannt"); lin know_V2V = variants {}; lin know_VS = variants {}; -lin know_VQ = variants {}; +lin know_VQ = mkVQ I.wissen_V ; lin know_all_N = variants {}; lin know_how_N = variants {}; lin knowing_A = variants {}; @@ -26494,7 +26495,7 @@ lin parishioner_N = variants {}; lin parisian_A = variants {}; lin parisian_N = variants {}; lin parity_N = variants {}; -lin park_N = variants {}; +lin park_N = mkN "Park" "Parks" masculine ; lin park_V = variants {}; lin park_V2 = variants {}; lin parka_N = reg2N "Anorak" "Anoraks" masculine; @@ -27735,7 +27736,7 @@ lin pivotal_A = regA "ausschlaggebend"; lin pixie_N = reg2N "Kobold" "Kobolde" masculine; lin pixilated_A = variants {}; lin pixy_N = variants {}; -lin pizza_N = variants {}; +lin pizza_N = mkN "Pizza" "Pizzen" feminine ; lin pizzicato_A = variants {}; lin pizzicato_Adv = variants {}; lin placard_N = reg2N "Plakat" "Plakate" neuter; @@ -32757,7 +32758,7 @@ lin scarce_A = mk3A "spärlich" "spärlicher" "spärlichste"; lin scarcity_N = reg2N "Mangel" "Mängel" masculine; lin scare_N = variants {}; lin scare_V = variants {}; -lin scare_V2 = variants {}; +lin scare_V2 = mkV2 (no_geV (mkV "erschrecken")) ; lin scarecrow_N = reg2N "Vogelscheuche" "Vogelscheuchen" feminine; lin scaremonger_N = variants {}; lin scarf_N = variants {}; diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 1357f812f..20aefe7d2 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -1,6 +1,6 @@ --# -path=.:../swedish -concrete DictionarySwe of Dictionary = CatSwe ** open ParadigmsSwe, (I = IrregSwe), (L = LexiconSwe), (M = MakeStructuralSwe), (S = SyntaxSwe) in { +concrete DictionarySwe of Dictionary = CatSwe ** open ParadigmsSwe, (I = IrregSwe), (C = CommonScand), (R = ResSwe), (L = LexiconSwe), (M = MakeStructuralSwe), (S = SyntaxSwe) in { flags coding = utf8; @@ -11211,6 +11211,7 @@ lin close_to_Prep = variants {} ; lin close_up_N = variants {} ; lin close_up_V = mkV "sluta" "slöt" "slutit" ; -- comment=11 lin close_up_V2 = variants {} ; +lin closed_A = mkA "stängd" "stängt" ; lin closefisted_A = variants {} ; lin closeness_N = variants {} ; lin closeout_N = variants {} ; @@ -11533,7 +11534,7 @@ lin coextension_N = variants {} ; lin coextensive_A = variants {} ; lin coextrude_V2 = variants {} ; lin cofactor_N = variants {} ; -lin coffee_N = mkN "kaffe" "kaffe" ; +lin coffee_N = mkN "kaffe" "kaffet" "kaffe" "kaffen" ; lin coffee_house_N = variants {} ; lin coffee_mill_N = variants {} ; lin coffee_stall_N = variants {} ; @@ -27347,7 +27348,7 @@ lin hover_V = mkV "sväva" ; -- status=guess, src=wikt lin hover_around_V = variants {} ; lin hovercraft_N = mkN "svävare" utrum | mkN "svävfarkost" "svävfarkoster" ; -- SaldoWN -- comment=2 lin how8many_IDet = S.how8many_IDet; -lin how8much_IDet = variants {} ; +lin how8much_IDet = {s = \\_ => ["hur mycket"] ; n = singular ; det = C.DDef C.Indef} ; lin how_IAdv = S.how_IAdv; lin how_d'ye_do_N = variants {} ; lin howard_PN = variants {} ; @@ -34384,8 +34385,8 @@ lin married_A = mkA "gift" "gift" ; lin married_N = mkN "gift" "giftet" "gifter" "gifterna" ; -- SaldoWN lin marrow_N = mkN "märg" ; lin marrowbone_N = variants {} ; -lin marry_V = mkV "viger" ; -- comment=3 -lin marry_V2 = mkV2 (mkV "förena"); -- status=guess, src=wikt +lin marry_V = depV (mkV "gifter") ; +lin marry_V2 = mkV2 (mkV "gifter") ; lin marry_in_V = mkV "viger" ; -- comment=3 lin marry_out_V = mkV "viger" ; -- comment=3 lin mars_PN = variants {} ; @@ -58550,6 +58551,7 @@ lin tire_V = mkV "ringer" ; -- comment=2 lin tire_V2 = variants {} ; lin tire_of_V2 = variants {} ; lin tire_out_V2 = variants {} ; +lin tired_A = mkA "trött" "trött" ; lin tiredly_Adv = variants {} ; lin tiredness_N = mkN "trötthet" ; -- status=guess lin tireless_A = mkA "outtröttlig" ; -- comment=2