msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

resolved a conflict in DictionaryFin

Browse Source
This commit is contained in:
aarne
2014-04-26 18:24:37 +00:00
parent 5b32607756
commit 92aa1230e2
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/src/translator/DictionaryFin.gf
View File

@@ -48243,12 +48243,8 @@ lin staff_N = mkN "henkilökunta" ;
lin staff_V2 = mkWV2 (k53A "miehittää") ; --UNCHK lin staff_V2 = mkWV2 (k53A "miehittää") ; --UNCHK
lin staff_office_N = mkWN (compoundN "henkilöstö" (k2 "osasto")) ; --UNCHK lin staff_office_N = mkWN (compoundN "henkilöstö" (k2 "osasto")) ; --UNCHK
lin stag_N = mkWN (compoundN "uros" (k7 "hirvi")) ; --UNCHK lin stag_N = mkWN (compoundN "uros" (k7 "hirvi")) ; --UNCHK
lin stag_V = variants{} ; -- lin stag_V = variants{} ;
v v v v v v v lin stage_N = mkN "vaihe" | mkN "näyttämö" ; --- split
lin stage_N = mkN "näyttämö" ; --- split mkWN (k5A "etappi") ; --f57
*************
lin stage_N = mkN "vaihe" | mkWN (k5A "etappi") ; --- split näyttämö
^ ^ ^ ^ ^ ^ ^
lin stage_V = mkWV (k71 "tehdä") ; --UNCHK lin stage_V = mkWV (k71 "tehdä") ; --UNCHK
lin stage_V2 = mkWV2 (k71 "tehdä") ; --UNCHK lin stage_V2 = mkWV2 (k71 "tehdä") ; --UNCHK
lin stage_whisper_N = mkWN (compoundN "teatteri" (k39 "kuiskaus")) ; --UNCHK lin stage_whisper_N = mkWN (compoundN "teatteri" (k39 "kuiskaus")) ; --UNCHK