Merge pull request #967 from globalwordnet/issue-950

Merge sense of cultivate and foster

src/deprecations.csv

@@ -99,3 +99,4 @@
 "ewn-02209880-v","","ewn-02208144-v","i32770","Duplicate (#932)"
 "ewn-02506046-v","","ewn-02506138-v","i34220","Duplicate (#934)"
 "ewn-02596409-v","i34632","ewn-02606776-v","i34693","Duplicate (#935)"
+"ewn-01746607-v","i30448","ewn-02560130-v","i34465","Duplicate (#950)"

src/yaml/entries-c.yaml

@@ -118010,16 +118010,6 @@ cultivate:
     pronunciation:
     - value: ˈkʌltɪveɪt
     sense:
-    - derivation:
-      - 'cultivation%1:04:00::'
-      - 'cultivator%1:18:00::'
-      - 'cultivation%1:22:00::'
-      id: 'cultivate%2:36:00::'
-      sent:
-      - They cultivate rye in the field
-      subcat:
-      - vtai
-      synset: 01746607-v
     - derivation:
       - 'cultivation%1:04:00::'
       - 'cultivator%1:06:00::'
@@ -118038,6 +118028,16 @@ cultivate:
       subcat:
       - vtai
       synset: 00303245-v
+    - derivation:
+      - 'cultivation%1:04:00::'
+      - 'cultivator%1:18:00::'
+      - 'cultivation%1:22:00::'
+      id: 'cultivate%2:41:02::'
+      sent:
+      - They cultivate rye in the field
+      subcat:
+      - vtai
+      synset: 02560130-v
 cultivated:
   a:
     pronunciation:
@@ -118107,15 +118107,15 @@ cultivation:
       synset: 01131684-n
     - derivation:
       - 'cultivate%2:36:01::'
-      - 'cultivate%2:36:00::'
+      - 'cultivate%2:41:02::'
       id: 'cultivation%1:04:00::'
       synset: 00917553-n
     - derivation:
       - 'cultivate%2:41:00::'
       id: 'cultivation%1:26:00::'
       synset: 14483408-n
     - derivation:
-      - 'cultivate%2:36:00::'
+      - 'cultivate%2:41:02::'
       id: 'cultivation%1:22:00::'
       synset: 13475491-n
     - id: 'cultivation%1:04:02::'
@@ -118124,7 +118124,7 @@ cultivator:
   n:
     sense:
     - derivation:
-      - 'cultivate%2:36:00::'
+      - 'cultivate%2:41:02::'
       id: 'cultivator%1:18:00::'
       synset: 09799231-n
     - derivation:

src/yaml/verb.creation.yaml

@@ -7217,7 +7217,7 @@
   - We grow wheat here
   - We raise hogs here
   hypernym:
-  - 01746607-v
+  - 02560130-v
   ili: i30436
   members:
   - grow
@@ -7381,15 +7381,6 @@
   members:
   - hoe
   partOfSpeech: v
-01746607-v:
-  definition:
-  - foster the growth of
-  domain_topic:
-  - 00918295-n
-  ili: i30448
-  members:
-  - cultivate
-  partOfSpeech: v
 01746767-v:
   definition:
   - reproduce someone's behavior or looks

src/yaml/verb.social.yaml

@@ -10217,6 +10217,8 @@
 02560130-v:
   definition:
   - promote the growth of
+  domain_topic:
+  - 00918295-n
   example:
   - Foster our children's well-being and education
   hypernym:
@@ -10225,6 +10227,7 @@
   members:
   - foster
   - further
+  - cultivate
   partOfSpeech: v
 02560355-v:
   definition: