From 63a69815aaf6fbcfff619bbd49df438b5d6cbd13 Mon Sep 17 00:00:00 2001
From: inari <inari@chalmers.se>
Date: Tue, 29 Apr 2014 17:12:42 +0000
Subject: [PATCH] Merge til, till and until in Dictionary

---
 lib/src/translator/Dictionary.gf    | 2 --
 lib/src/translator/DictionaryBul.gf | 2 --
 lib/src/translator/DictionaryChi.gf | 4 +---
 lib/src/translator/DictionaryDut.gf | 3 +--
 lib/src/translator/DictionaryEng.gf | 6 ++----
 lib/src/translator/DictionaryFin.gf | 4 +---
 lib/src/translator/DictionaryFre.gf | 5 ++---
 lib/src/translator/DictionaryGer.gf | 4 +---
 lib/src/translator/DictionaryHin.gf | 1 +
 lib/src/translator/DictionaryIta.gf | 3 +--
 lib/src/translator/DictionarySpa.gf | 3 +--
 lib/src/translator/DictionarySwe.gf | 4 +---
 12 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf
index e419d7d62..173f6f33b 100644
--- a/lib/src/translator/Dictionary.gf
+++ b/lib/src/translator/Dictionary.gf
@@ -59270,7 +59270,6 @@ fun tights_N : N ;
 fun tiglon_N : N ;
 fun tigress_N : N ;
 fun tike_N : N ;
-fun til_Prep : Prep  ;
 fun tilburg_PN : PN ;
 fun tilbury_PN : PN ;
 fun tilde_N : N ;
@@ -59280,7 +59279,6 @@ fun tilefish_N : N ;
 fun tiler_N : N ;
 fun tiling_N : N ;
 fun till_N : N ;
-fun till_Prep : Prep  ;
 fun till_Subj : Subj ;
 fun till_V2 : V2 ;
 fun tillage_N : N ;
diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf
index 9a8681a66..a602d9635 100644
--- a/lib/src/translator/DictionaryBul.gf
+++ b/lib/src/translator/DictionaryBul.gf
@@ -55762,7 +55762,6 @@ lin tights_N = mkN014 "чорапогащник"; ----
 lin tiglon_N = variants {};
 lin tigress_N = mkN041 "тигрица";
 lin tike_N = variants {};
-lin til_Prep = variants {};
 lin tilburg_PN = variants {};
 lin tilbury_PN = variants {};
 lin tilde_N = variants {};
@@ -55772,7 +55771,6 @@ lin tilefish_N = variants {};
 lin tiler_N = mkN039 "фаянсаджия";
 lin tiling_N = mkN041 "облицовка"; ----
 lin till_N = variants {mkN041 "каса"; mkN065 "чекмедже"}; ----
-lin till_Prep = variants {};
 lin till_V2 = variants {};
 lin tillage_N = mkN071 "култивиране" ; ----
 lin tiller_N = variants {mkN008a "земеделец"; mkN041 "издънка"; mkN007 "култиватор"; mkN041 "манивела"}; ----
diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf
index 632414081..2aae14563 100644
--- a/lib/src/translator/DictionaryChi.gf
+++ b/lib/src/translator/DictionaryChi.gf
@@ -15332,10 +15332,8 @@ lin tight_lipped_A = mkA "守口如瓶" ;
 lin tighten_V = mkV "紧缩" ;
 lin tighten_V2 = mkV2 "紧缩" ;
 lin tightness_N = mkN "坚固" ;
-lin til_Prep = mkPrep "胡麻" ;
 lin tile_N = mkN "瓦片" "块" ;
 lin till_N = mkN "备用现金""" ;
-lin till_Prep = mkPrep "直到" ;
 lin till_V2 = mkV2 "使+耕种" ;
 lin tiller_N = mkN "舵柄" ;
 lin tilt_N = mkN "倾斜" ;
@@ -16132,7 +16130,7 @@ lin unsympathetic_A = mkA "绝情" ;
 lin untapped_A = mkA "未开发" ;
 lin untested_A = mkA "未经试验" ;
 lin unthinkable_A = mkA "不可想象" ;
-lin until_Prep = mkPrep "直到" ;
+lin until_Prep = mkPrep "直到" | mkPrep "胡麻" ;
 lin until_Subj = mkSubj "直到" ;
 lin unto_Prep = mkPrep "到" ;--"直到" ;
 lin untold_A = mkA "数不清" ;
diff --git a/lib/src/translator/DictionaryDut.gf b/lib/src/translator/DictionaryDut.gf
index 4410ec256..2a22f0b3e 100644
--- a/lib/src/translator/DictionaryDut.gf
+++ b/lib/src/translator/DictionaryDut.gf
@@ -17085,7 +17085,6 @@ lin tilde_N = mkN "tilde" ; -- status=guess
 lin tile_N = mkN "tegel" masculine | mkN "vloertegel" feminine | mkN "muurtegel" masculine | mkN "pan" feminine | mkN "dakpan" feminine ; -- status=guess status=guess status=guess status=guess status=guess
 lin tile_V2 = mkV2 (mkV "tegelen") | mkV2 (mkV "betegelen") ; -- status=guess, src=wikt status=guess, src=wikt
 lin tiling_N = mkN "betegeling" feminine ; -- status=guess
-lin till_Prep = variants{} ; --
 lin till_Subj = variants{} ; --
 lin till_V2 = mkV2 (mkV "ploegen") | mkV2 (mkV "bewerken") | mkV2 (mkV "bebouwen") ; -- status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt
 lin tiller_N = mkN "graafmachine" ; -- status=guess
@@ -17782,7 +17781,7 @@ lin unthinkable_A = mkA "ondenkbaar" ; -- status=guess
 lin untidy_A = mkA "slordigmorsig" ; -- status=guess
 lin untie_V = mkV "loskomen" ; -- status=guess, src=wikt
 lin untie_V2 = mkV2 (mkV "loskomen") ; -- status=guess, src=wikt
-lin until_Prep = variants{} ; --
+lin until_Prep = mkPrep "tot" | mkPrep "totdat" ;
 lin until_Subj = mkSubj "tot" | mkSubj "totdat" ;
 lin untoward_A = mkA "ongunstigschadelijk" ; -- status=guess
 lin untranslatable_A = mkA "onvertaalbaar" ; -- status=guess
diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf
index b86f4bfb2..f0fd91cdc 100644
--- a/lib/src/translator/DictionaryEng.gf
+++ b/lib/src/translator/DictionaryEng.gf
@@ -59274,7 +59274,6 @@ lin tights_N = mkN "tights" ;
 lin tiglon_N = mkN "tiglon" ;
 lin tigress_N = mkN "tigress" "tigresses";
 lin tike_N = mkN "tike" "tikes";
-lin til_Prep = mkPrep "'til";
 lin tilburg_PN = mkPN "Tilburg";
 lin tilbury_PN = mkPN "Tilbury";
 lin tilde_N = mkN "tilde" "tildes";
@@ -59284,7 +59283,6 @@ lin tilefish_N = mkN "tilefish" ;
 lin tiler_N = mkN "tiler" ;
 lin tiling_N = mkN "tiling" ;
 lin till_N = mkN "till" "tills";
-lin till_Prep = mkPrep "till";
 lin till_Subj = mkSubj "till" ;
 lin till_V2 = mkV2 (mkV "till" "tills" "tilled" "tilled" "tilling");
 lin tillage_N = mkN "tillage" ;
@@ -62720,8 +62718,8 @@ lin untie_V = mkV "untie" "IRREG" "IRREG" "IRREG" "IRREG";
 lin untie_V2 = mkV2 (mkV "untie" "IRREG" "IRREG" "IRREG" "IRREG");
 lin untied_A = mkA "untied" ;
 lin until_Adv = mkAdv "until" ;
-lin until_Prep = mkPrep "until";
-lin until_Subj = mkSubj "until";
+lin until_Prep = mkPrep "until" | mkPrep "till" | mkPrep "til" | mkPrep "'til" ;
+lin until_Subj = mkSubj "until" ;
 lin untilled_A = mkA "untilled" ;
 lin untimbered_A = mkA "untimbered" ;
 lin untimely_A = compoundA (mkA "untimely");
diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf
index 85bfd93fd..64ce8259c 100644
--- a/lib/src/translator/DictionaryFin.gf
+++ b/lib/src/translator/DictionaryFin.gf
@@ -51764,7 +51764,6 @@ lin tightrope_N = mkWN (k10 "nuora") ; --UNCHK
 lin tiglon_N = mkWN (compoundN "tii" (k5 "koni")) ; --UNCHK
 lin tigress_N = mkWN (compoundN "naaras" (k6 "tiikeri")) ; --UNCHK
 lin tike_N = mkWN (k38 "nuorukainen") ; --UNCHK
-lin til_Prep = mkPrep "saakka" illative ;
 lin tilde_N = mkWN (k8 "tilde") ; --UNCHK
 lin tile_N = mkWN (k9A "laatta") ;
 lin tile_V2 = mkWV2 (k53A "laatoittaa") ; --UNCHK
@@ -51772,7 +51771,6 @@ lin tilefish_N = mkWN (compoundN "juovatorpedo" (k32 "ahven")) ; --UNCHK
 lin tiler_N = mkWN (k6 "muurari") ; --UNCHK
 lin tiling_N = mkWN (compoundN "muu" (k38 "raaminen")) ; --UNCHK
 lin till_N = mkWN (k9 "kassa") ; --UNCHK
-lin till_Prep = mkPrep illative "asti" ;
 lin till_Subj = variants{} ; --
 lin till_V2 = mkWV2 (k53A "kyntää") ; --UNCHK
 lin tillage_N = mkWN (compoundN "maan" (k39 "muokkaus")) ; --UNCHK
@@ -54893,7 +54891,7 @@ lin untidy_A = mkWA (k38 "sotkuinen") ; --UNCHK
 lin untie_V = mkWV (k53A "irrottaa") ; --UNCHK
 lin untie_V2 = mkWV2 (k53A "irrottaa") ; --UNCHK
 lin untied_A = mkWA (compoundA "reps" (k10 "ottava")) ; --UNCHK
-lin until_Prep = postPrep elative "asti" ;
+lin until_Prep = postPrep elative "asti" | postPrep illative "saakka" ;
 lin until_Subj = lin Subj (ss "kunnes") ;
 lin untilled_A = mkWA "muokkaamaton" ; --UNCHK
 lin untimbered_A = mkWA (compoundA "kaari" (k34A "puuton")) ; --UNCHK
diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf
index c216d87ac..846dafdcb 100644
--- a/lib/src/translator/DictionaryFre.gf
+++ b/lib/src/translator/DictionaryFre.gf
@@ -20469,7 +20469,6 @@ lin tilde_N = mkN "tilde" masculine ; -- tocheck
 lin tile_N = mkN "carreau" ; -- tocheck
 lin tiler_N = mkN "carreleur" masculine ; -- tocheck
 lin tiling_N = mkN "carrelage" masculine ; -- tocheck
-lin till_Prep = variants{} ; --
 lin till_Subj = variants{} ; --
 lin till_V2 = mkV2 (mkV "labourer") ; -- tocheck
 lin tillage_N = mkN "labour" feminine ; -- tocheck
@@ -21331,8 +21330,8 @@ lin untenable_A = mkA "intenable" ; -- tocheck
 lin unthinkable_A = mkA "inconcevable" | mkA "incroyable" ; -- tocheck
 lin untidy_A = mkA "débraillé" | mkA "désordonné" ; -- tocheck
 lin untie_V2 = mkV2 (mkV "détacher") ; -- tocheck
-lin until_Prep = variants{} ; --
-lin until_Subj = M.mkSubjSubj ("jusqu´à ce" ++ Ph.elisQue) ;
+lin until_Prep = mkPrep ("jusqu'à ce" ++ Ph.elisQue) ;
+lin until_Subj = M.mkSubjSubj ("jusqu'à ce" ++ Ph.elisQue) ;
 lin untouchable_A = mkA "intouchable" ; -- tocheck
 lin untoward_A = mkA "désavantagieuxnocif" | mkA "irrégulierennuyeux" | mkA "inopportundéplacé" ; -- tocheck
 lin untranslatable_A = mkA "intraduisible" ; -- tocheck
diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf
index 05531758a..d075c1546 100644
--- a/lib/src/translator/DictionaryGer.gf
+++ b/lib/src/translator/DictionaryGer.gf
@@ -39427,14 +39427,12 @@ lin tightness_N = variants {};
 lin tightrope_N = variants {};
 lin tigress_N = variants {};
 lin tike_N = variants {};
-lin til_Prep = variants {};
 lin tilburg_PN = variants {};
 lin tilbury_PN = variants {};
 lin tilde_N = reg2N "Tilde" "Tilden" feminine;
 lin tile_N = reg2N "Dachziegel" "Dachziegel" masculine;
 lin tile_V2 = variants {};
 lin till_N = variants {};
-lin till_Prep = variants{} ; --
 lin till_Subj = variants{} ; --
 lin till_V2 = variants {};
 lin tillage_N = variants {};
@@ -41686,7 +41684,7 @@ lin untidiness_N = variants {};
 lin untidy_A = mk3A "unordentlich" "unordentlicher" "unordentlichste";
 lin untie_V = variants {};
 lin untie_V2 = variants {};
-lin until_Prep = variants{} ; --
+lin until_Prep = mkPrep "bis" ;
 lin until_Subj = ss "bis" ;
 lin untimely_A = variants {};
 lin untiring_A = variants {};
diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf
index 55654e67d..c3cdbf7ca 100644
--- a/lib/src/translator/DictionaryHin.gf
+++ b/lib/src/translator/DictionaryHin.gf
@@ -31258,6 +31258,7 @@ lin untidy_A = mkA "मैला" ; -- tocheck
 lin untie_V = mkV "खोलना" ; -- tocheck              
 lin untie_V2 = mkV2 (mkV "खोलना") ; -- tocheck
 lin untied_A = mkA "खुला" ; -- tocheck       
+lin until_Prep = variants {} ;
 lin untilled_A = mkA "अकृरित" ; -- tocheck       
 lin untimbered_A = mkA "अवृक्षावृत" ; -- tocheck       
 lin untimely_A = mkA "बेमौका" ; -- tocheck              
diff --git a/lib/src/translator/DictionaryIta.gf b/lib/src/translator/DictionaryIta.gf
index e92a1cd8e..f756f3005 100644
--- a/lib/src/translator/DictionaryIta.gf
+++ b/lib/src/translator/DictionaryIta.gf
@@ -17256,7 +17256,6 @@ lin tightrope_N = mkN "funambolo" ; -- status=guess
 lin tights_N = mkN "calzamaglia" ; -- status=guess
 lin tile_N = mkN "[floor and wall tile] piastrella" | mkN "[roof tile] tegola" | mkN "coppo" ; -- status=guess status=guess status=guess
 lin tile_V2 = mkV2 (mkV "piastrellare") ; -- status=guess, src=wikt
-lin till_Prep = variants{} ; --
 lin till_Subj = variants{} ; --
 lin till_V2 = mkV2 (mkV "arare") ; -- status=guess, src=wikt
 lin tillage_N = mkN "coltivazione" feminine ; -- status=guess
@@ -17971,7 +17970,7 @@ lin unsure_A = mkA "incerto" ; -- status=guess
 lin unsympathetic_A = mkA "antipatico" ; -- status=guess
 lin untie_V = mkV "sciogliersi" ; -- status=guess, src=wikt
 lin untie_V2 = mkV2 (mkV "sciogliersi") ; -- status=guess, src=wikt
-lin until_Prep = variants{} ; --
+lin until_Prep = mkPrep "fine" ;
 lin until_Subj = subSubj "fino a che" ;
 lin untraceable_A = mkA "non tracciabile" | mkA "irrintracciabile" | mkA "irreperibile" ; -- status=guess status=guess status=guess
 lin untruth_N = mkN "bugia" ; -- status=guess
diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf
index 28c9568d1..e60c5a137 100644
--- a/lib/src/translator/DictionarySpa.gf
+++ b/lib/src/translator/DictionarySpa.gf
@@ -20841,7 +20841,6 @@ lin tile_N = mkN "azulejo" | mkN "alicatado" | mkN "baldosa" | mkN "teja" ;
 lin tile_V2 = mkV2 (mkV (mkV "alicatar") "o azulejar") | mkV2 (mkV "embaldosar") | mkV2 (mkV "tejar.") ; -- status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt
 lin tiler_N = mkN "embaldosador" | mkN "solador" masculine ; -- status=guess status=guess
 lin till_N = mkN "caja" ; -- status=guess
-lin till_Prep = variants{} ; --
 lin till_Subj = variants{} ; --
 lin till_V2 = mkV2 (mkV "arar") ; -- status=guess, src=wikt
 lin tillage_N = mkN "labranza" ; -- status=guess
@@ -21691,7 +21690,7 @@ lin unthinkable_A = mkA "impensable" ; -- status=guess
 lin untidy_A = mkA "descuidado" ; -- status=guess
 lin untie_V = mkV "desatarse" ; -- status=guess, src=wikt
 lin untie_V2 = mkV2 (mkV "desatarse") ; -- status=guess, src=wikt
-lin until_Prep = variants{} ; --
+lin until_Prep = mkPrep "hasta" ;
 lin until_Subj = ss "hasta que" ** {m = Conjunct} ;
 lin untouchable_A = mkA "intocable" ; -- status=guess
 lin untoward_A = mkA "desfavorable" | mkA "adverso" | mkA "desventajoso" ; -- status=guess status=guess status=guess
diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf
index bd9bcdaaf..c68db240b 100644
--- a/lib/src/translator/DictionarySwe.gf
+++ b/lib/src/translator/DictionarySwe.gf
@@ -58805,7 +58805,6 @@ lin tights_N = mkN "trikå" "trikåer" ; -- comment=2
 lin tiglon_N = variants {} ;
 lin tigress_N = mkN "tigerhona" | mkN "tigrinna" ; -- status=guess status=guess
 lin tike_N = variants {} ;
-lin til_Prep = variants {} ;
 lin tilburg_PN = variants {} ;
 lin tilbury_PN = variants {} ;
 lin tilde_N = mkN "tilde" ; -- status=guess
@@ -58815,7 +58814,6 @@ lin tilefish_N = variants {} ;
 lin tiler_N = variants {} ;
 lin tiling_N = variants {} ;
 lin till_N = mkN "kassalåda" ; -- comment=4
-lin till_Prep = mkPrep "till" ;
 lin till_Subj = variants{} ; --
 lin till_V2 = dirV2 (partV (mkV "yxar")"till"); -- comment=71
 lin tillage_N = mkN "odling" ;
@@ -62236,7 +62234,7 @@ lin untidy_A = compoundA (regA "ovårdad"); -- comment=10
 lin untie_V = variants {} ;
 lin untie_V2 = variants {} ;
 lin untied_A = variants {} ;
-lin until_Prep = mkPrep "ända till" ; --
+lin until_Prep = mkPrep "ända till" | mkPrep "till" ;
 lin until_Subj = M.mkSubj "tills" ;
 lin untilled_A = variants {} ;
 lin untimbered_A = variants {} ;