Merge remote-tracking branch 'upstream/master'

Author: tkuebler

.gitignore

@@ -1,7 +1,4 @@
 # folders
-VS2010/Debug/
-VS2010/ipch
-VS2015/
 mackore/KoreNLPXC/KoreNLPXC.xcodeproj/xcuserdata/
 mackore/KoreNLPXC/KoreNLPXC.xcodeproj/project.xcworkspace/xcuserdata/
 
@@ -32,6 +29,12 @@ BINARIES/chatscript_Debug_v140.exe
 *.user
 *.suo
 
+# ignore local user settings for Visual Studio 2015/2017
+VS2015/.vs/
+VS2015/Debug/
+VS2017/.vs/
+VS2017/Debug/
+
 # specific files
 private/KORA/TESTS/regress-qabots-result*.txt
 private/KORA/TESTS/*.swp

BINARIES/LinuxChatScript64

@@ -4244,9 +4244,9 @@
  blue_wall_of_silence ( meanings=1 glosses=1 NOUN_ABSTRACT NOUN NOUN_SINGULAR ) 
     wall_of_silence~1nz (^cover-up~1) the secrecy of police officers who lie or look the other way to protect other police officers
  blue ( meanings=11 glosses=8 NOUN_ABSTRACT VERB_PRESENT VERB_INFINITIVE NOUN VERB ADJECTIVE ADJECTIVE_NORMAL NOUN_SINGULAR ADJECTIVE_NOT_PREDICATE COMMON4 COMMON1 NOUN_NODETERMINER KINDERGARTEN posdefault:ADJECTIVE VERB_NOOBJECT ADJECTIVE_GOOD_SUBJECT_COMPLEMENT ) comparative=bluest 
-    blueness~1nz (^chromatic_colour~1) blue color or pigment
+    blueness~1nz (^lycaenid_butterfly~1) blue color or pigment
     blue~2nz (^organization~6) any organization or party whose uniforms or badges are blue
-    wild_blue_yonder~1nz (^sky~1) the sky as viewed during daylight
+    wild_blue_yonder~1nz (^article_of_clothing~1) the sky as viewed during daylight
     blueing~2nz (^dye~1) used to whiten laundry or hair or give it a bluish tinge
     profane~1az characterized by profanity or cursing
     low~4a 

BINARIES/chatscript.exe

@@ -632,6 +632,7 @@
  Dykstra ( NOUN_HUMAN NOUN NOUN_PROPER_SINGULAR ) 
  Dysart ( NOUN_HUMAN NOUN NOUN_PROPER_SINGULAR ) 
  Dyson ( NOUN_HUMAN NOUN NOUN_PROPER_SINGULAR ) 
+ Digby ( NOUN_HUMAN NOUN_FIRSTNAME NOUN_HE NOUN NOUN_PROPER_SINGULAR ) 
  Dabi ( NOUN_HUMAN NOUN_FIRSTNAME NOUN_HE NOUN NOUN_PROPER_SINGULAR ) 
  Dabir ( NOUN_HUMAN NOUN_FIRSTNAME NOUN_HE NOUN NOUN_PROPER_SINGULAR ) 
  Dace ( NOUN_HUMAN NOUN_FIRSTNAME NOUN_HE NOUN NOUN_PROPER_SINGULAR ) 

BINARIES/chatscriptpg.exe

@@ -50682,7 +50682,6 @@
 ( staff_officer~1 is commissioned_officer~1 )
 ( striker~4 is sailor~2 )
 ( subaltern~1 is commissioned_military_officer~1 )
-( territorial~2 is soldier~2 )
 ( volunteer~2 is man~9 )
 ( warrant_officer~1 is officer~1 )
 ( weekend_warrior~1 is reservist~1 )
@@ -84331,6 +84330,17 @@
 ( graveyard_watch~1 is watch~5 )
 ( golden_age~2 is blossom~2 )
 ( regency~2 is rule~12 )
+( stick~8 is butter~1 )
+( must~2 is grape_juice~1 )
+( blue~3 is article_of_clothing~1 )
+( blue~1 is lycaenid_butterfly~1 )
+( take~7 is become~1 )
+( take~9 is interpret~2 )
+( take~20 is have_intercourse~1 )
+( nick~4 is copulate~1 )
+( service~16 is copulate~1 )
+( tread~6 is copulate~1 )
+( mount~9 is copulate~1 )
 ( relation~2 is reciprocation~1 )
 ( amount~4 is possession~1 )
 ( credit~8 is possession~1 )

DICT/ENGLISH/b.txt

@@ -14036,7 +14036,7 @@
     crazed~1az driven insane
     half-crazed~2az 
  hunky-dory ( meanings=2 ADJECTIVE ADJECTIVE_NORMAL posdefault:ADJECTIVE ) 
-    ok~1a 
+    o.k.~1a 
     hunky-dory~2az 
  higher-ranking ( meanings=1 ADJECTIVE ADJECTIVE_NORMAL posdefault:ADJECTIVE ) 
     ranking~2a