Merge pull request #2211 from nacho4d/feature/2156

Feature/2156

2 files changed, 437 insertions, 93 deletions

diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib
index e144f255..7a2988d2 100644
--- a/Interfaces/English.lproj/MainMenu.xib
+++ b/Interfaces/English.lproj/MainMenu.xib
@@ -937,42 +937,178 @@
 										</array>
 									</object>
 								</object>
-								<object class="NSMenuItem" id="631929208">
+								<object class="NSMenuItem" id="344418183">
 									<reference key="NSMenu" ref="565667192"/>
-									<string key="NSTitle">Spelling</string>
+									<string key="NSTitle">Spelling and Grammar</string>
 									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="325032718"/>
 									<reference key="NSMixedImage" ref="674471825"/>
 									<string key="NSAction">submenuAction:</string>
-									<reference key="NSTarget" ref="871433454"/>
-									<object class="NSMenu" key="NSSubmenu" id="871433454">
+									<reference key="NSTarget" ref="655178834"/>
+									<object class="NSMenu" key="NSSubmenu" id="655178834">
 										<string key="NSTitle">Spelling</string>
 										<array class="NSMutableArray" key="NSMenuItems">
-											<object class="NSMenuItem" id="145505496">
-												<reference key="NSMenu" ref="871433454"/>
-												<string key="NSTitle">Spelling...</string>
+											<object class="NSMenuItem" id="121594454">
+												<reference key="NSMenu" ref="655178834"/>
+												<string key="NSTitle">Show Spelling and Grammar</string>
 												<string key="NSKeyEquiv">:</string>
 												<int key="NSKeyEquivModMask">1048576</int>
 												<int key="NSMnemonicLoc">2147483647</int>
 												<reference key="NSOnImage" ref="325032718"/>
 												<reference key="NSMixedImage" ref="674471825"/>
 											</object>
-											<object class="NSMenuItem" id="377088066">
-												<reference key="NSMenu" ref="871433454"/>
-												<string key="NSTitle">Check Spelling</string>
+											<object class="NSMenuItem" id="399282874">
+												<reference key="NSMenu" ref="655178834"/>
+												<string key="NSTitle">Check Document Now</string>
 												<string key="NSKeyEquiv">;</string>
 												<int key="NSKeyEquivModMask">1048576</int>
 												<int key="NSMnemonicLoc">2147483647</int>
 												<reference key="NSOnImage" ref="325032718"/>
 												<reference key="NSMixedImage" ref="674471825"/>
 											</object>
-											<object class="NSMenuItem" id="594554096">
-												<reference key="NSMenu" ref="871433454"/>
-												<string key="NSTitle">Check Spelling As You Type</string>
+											<object class="NSMenuItem" id="20635564">
+												<reference key="NSMenu" ref="655178834"/>
+												<bool key="NSIsDisabled">YES</bool>
+												<bool key="NSIsSeparator">YES</bool>
+												<string key="NSTitle"/>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="325032718"/>
+												<reference key="NSMixedImage" ref="674471825"/>
+											</object>
+											<object class="NSMenuItem" id="862457551">
+												<reference key="NSMenu" ref="655178834"/>
+												<string key="NSTitle">Check Spelling While Typing</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="325032718"/>
+												<reference key="NSMixedImage" ref="674471825"/>
+											</object>
+											<object class="NSMenuItem" id="677476051">
+												<reference key="NSMenu" ref="655178834"/>
+												<string key="NSTitle">Check Grammar With Spelling</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="325032718"/>
+												<reference key="NSMixedImage" ref="674471825"/>
+											</object>
+											<object class="NSMenuItem" id="119758306">
+												<reference key="NSMenu" ref="655178834"/>
+												<string key="NSTitle">Correct Spelling Automatically</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="325032718"/>
+												<reference key="NSMixedImage" ref="674471825"/>
+											</object>
+										</array>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="565610698">
+									<reference key="NSMenu" ref="565667192"/>
+									<string key="NSTitle">Substitutions</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="325032718"/>
+									<reference key="NSMixedImage" ref="674471825"/>
+									<string key="NSAction">submenuAction:</string>
+									<reference key="NSTarget" ref="485408925"/>
+									<object class="NSMenu" key="NSSubmenu" id="485408925">
+										<string key="NSTitle">Substitutions</string>
+										<array class="NSMutableArray" key="NSMenuItems">
+											<object class="NSMenuItem" id="372292189">
+												<reference key="NSMenu" ref="485408925"/>
+												<string key="NSTitle">Show Substitutions</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="325032718"/>
+												<reference key="NSMixedImage" ref="674471825"/>
+											</object>
+											<object class="NSMenuItem" id="421164362">
+												<reference key="NSMenu" ref="485408925"/>
+												<bool key="NSIsDisabled">YES</bool>
+												<bool key="NSIsSeparator">YES</bool>
+												<string key="NSTitle"/>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="325032718"/>
+												<reference key="NSMixedImage" ref="674471825"/>
+											</object>
+											<object class="NSMenuItem" id="971852303">
+												<reference key="NSMenu" ref="485408925"/>
+												<string key="NSTitle">Smart Copy/Paste</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="325032718"/>
+												<reference key="NSMixedImage" ref="674471825"/>
+											</object>
+											<object class="NSMenuItem" id="567275781">
+												<reference key="NSMenu" ref="485408925"/>
+												<string key="NSTitle">Smart Quotes</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="325032718"/>
+												<reference key="NSMixedImage" ref="674471825"/>
+											</object>
+											<object class="NSMenuItem" id="683208530">
+												<reference key="NSMenu" ref="485408925"/>
+												<string key="NSTitle">Smart Dashes</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="325032718"/>
+												<reference key="NSMixedImage" ref="674471825"/>
+											</object>
+											<object class="NSMenuItem" id="476546682">
+												<reference key="NSMenu" ref="485408925"/>
+												<string key="NSTitle">Smart Links</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="325032718"/>
+												<reference key="NSMixedImage" ref="674471825"/>
+											</object>
+											<object class="NSMenuItem" id="145559693">
+												<reference key="NSMenu" ref="485408925"/>
+												<string key="NSTitle">Data Detectors</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="325032718"/>
+												<reference key="NSMixedImage" ref="674471825"/>
+											</object>
+											<object class="NSMenuItem" id="271746474">
+												<reference key="NSMenu" ref="485408925"/>
+												<string key="NSTitle">Text Replacement</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="325032718"/>
+												<reference key="NSMixedImage" ref="674471825"/>
+											</object>
+										</array>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="85027785">
+									<reference key="NSMenu" ref="565667192"/>
+									<string key="NSTitle">Speech</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="325032718"/>
+									<reference key="NSMixedImage" ref="674471825"/>
+									<string key="NSAction">submenuAction:</string>
+									<reference key="NSTarget" ref="923215070"/>
+									<object class="NSMenu" key="NSSubmenu" id="923215070">
+										<string key="NSTitle">Speech</string>
+										<array class="NSMutableArray" key="NSMenuItems">
+											<object class="NSMenuItem" id="761425893">
+												<reference key="NSMenu" ref="923215070"/>
+												<string key="NSTitle">Start Speaking</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="325032718"/>
+												<reference key="NSMixedImage" ref="674471825"/>
+											</object>
+											<object class="NSMenuItem" id="644588777">
+												<reference key="NSMenu" ref="923215070"/>
+												<string key="NSTitle">Stop Speaking</string>
 												<string key="NSKeyEquiv"/>
-												<int key="NSKeyEquivModMask">1048576</int>
 												<int key="NSMnemonicLoc">2147483647</int>
 												<reference key="NSOnImage" ref="325032718"/>
 												<reference key="NSMixedImage" ref="674471825"/>
@@ -2597,30 +2733,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">showGuessPanel:</string>
-						<reference key="source" ref="1005713010"/>
-						<reference key="destination" ref="145505496"/>
-					</object>
-					<string key="id">188</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">checkSpelling:</string>
-						<reference key="source" ref="1005713010"/>
-						<reference key="destination" ref="377088066"/>
-					</object>
-					<string key="id">190</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleContinuousSpellChecking:</string>
-						<reference key="source" ref="1005713010"/>
-						<reference key="destination" ref="594554096"/>
-					</object>
-					<string key="id">192</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
 						<string key="label">toggleTabBarShown:</string>
 						<reference key="source" ref="1005713010"/>
 						<reference key="destination" ref="990323635"/>
@@ -3196,6 +3308,118 @@
 					<string key="id">KxK-Oo-Rsq</string>
 				</object>
 				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">stopSpeaking:</string>
+						<reference key="source" ref="1005713010"/>
+						<reference key="destination" ref="644588777"/>
+					</object>
+					<string key="id">yqH-pe-byl</string>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">startSpeaking:</string>
+						<reference key="source" ref="1005713010"/>
+						<reference key="destination" ref="761425893"/>
+					</object>
+					<string key="id">bd2-UP-v4o</string>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleAutomaticLinkDetection:</string>
+						<reference key="source" ref="1005713010"/>
+						<reference key="destination" ref="476546682"/>
+					</object>
+					<string key="id">2QJ-2Z-Syo</string>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleAutomaticTextReplacement:</string>
+						<reference key="source" ref="1005713010"/>
+						<reference key="destination" ref="271746474"/>
+					</object>
+					<string key="id">mFh-hJ-6K7</string>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleAutomaticQuoteSubstitution:</string>
+						<reference key="source" ref="1005713010"/>
+						<reference key="destination" ref="567275781"/>
+					</object>
+					<string key="id">i1g-fk-Nyq</string>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">orderFrontSubstitutionsPanel:</string>
+						<reference key="source" ref="1005713010"/>
+						<reference key="destination" ref="372292189"/>
+					</object>
+					<string key="id">khk-AE-cvv</string>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleAutomaticDataDetection:</string>
+						<reference key="source" ref="1005713010"/>
+						<reference key="destination" ref="145559693"/>
+					</object>
+					<string key="id">RxE-Rn-s3M</string>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleAutomaticDashSubstitution:</string>
+						<reference key="source" ref="1005713010"/>
+						<reference key="destination" ref="683208530"/>
+					</object>
+					<string key="id">HEV-LH-OBw</string>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleSmartInsertDelete:</string>
+						<reference key="source" ref="1005713010"/>
+						<reference key="destination" ref="971852303"/>
+					</object>
+					<string key="id">UZx-xw-zrS</string>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleGrammarChecking:</string>
+						<reference key="source" ref="1005713010"/>
+						<reference key="destination" ref="677476051"/>
+					</object>
+					<string key="id">Ovb-9u-igz</string>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showGuessPanel:</string>
+						<reference key="source" ref="1005713010"/>
+						<reference key="destination" ref="121594454"/>
+					</object>
+					<string key="id">kGB-mB-OYr</string>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">checkSpelling:</string>
+						<reference key="source" ref="1005713010"/>
+						<reference key="destination" ref="399282874"/>
+					</object>
+					<string key="id">ecI-hi-eLa</string>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleContinuousSpellChecking:</string>
+						<reference key="source" ref="1005713010"/>
+						<reference key="destination" ref="862457551"/>
+					</object>
+					<string key="id">nn2-tQ-SiI</string>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleAutomaticSpellingCorrection:</string>
+						<reference key="source" ref="1005713010"/>
+						<reference key="destination" ref="119758306"/>
+					</object>
+					<string key="id">mhI-Hy-VAZ</string>
+				</object>
+				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
 						<reference key="source" ref="524643114"/>
@@ -3688,7 +3912,9 @@
 							<reference ref="775296247"/>
 							<reference ref="986852824"/>
 							<reference ref="125958105"/>
-							<reference ref="631929208"/>
+							<reference ref="85027785"/>
+							<reference ref="565610698"/>
+							<reference ref="344418183"/>
 						</array>
 						<reference key="parent" ref="160028389"/>
 					</object>
@@ -3972,39 +4198,6 @@
 						<reference key="parent" ref="290049938"/>
 					</object>
 					<object class="IBObjectRecord">
-						<string key="id">184</string>
-						<reference key="object" ref="631929208"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="871433454"/>
-						</array>
-						<reference key="parent" ref="565667192"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">185</string>
-						<reference key="object" ref="871433454"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="145505496"/>
-							<reference ref="377088066"/>
-							<reference ref="594554096"/>
-						</array>
-						<reference key="parent" ref="631929208"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">187</string>
-						<reference key="object" ref="145505496"/>
-						<reference key="parent" ref="871433454"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">189</string>
-						<reference key="object" ref="377088066"/>
-						<reference key="parent" ref="871433454"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">191</string>
-						<reference key="object" ref="594554096"/>
-						<reference key="parent" ref="871433454"/>
-					</object>
-					<object class="IBObjectRecord">
 						<string key="id">496</string>
 						<reference key="object" ref="852669482"/>
 						<array class="NSMutableArray" key="children">
@@ -4796,6 +4989,147 @@
 						<reference key="object" ref="383065474"/>
 						<reference key="parent" ref="315159986"/>
 					</object>
+					<object class="IBObjectRecord">
+						<string key="id">qK5-Ty-Uao</string>
+						<reference key="object" ref="85027785"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="923215070"/>
+						</array>
+						<reference key="parent" ref="565667192"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">mGA-xh-Uwq</string>
+						<reference key="object" ref="923215070"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="644588777"/>
+							<reference ref="761425893"/>
+						</array>
+						<reference key="parent" ref="85027785"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">YwR-Sa-nn5</string>
+						<reference key="object" ref="644588777"/>
+						<reference key="parent" ref="923215070"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">elh-eq-jVU</string>
+						<reference key="object" ref="761425893"/>
+						<reference key="parent" ref="923215070"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">zbw-kN-6gM</string>
+						<reference key="object" ref="565610698"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="485408925"/>
+						</array>
+						<reference key="parent" ref="565667192"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">tMm-qx-zUV</string>
+						<reference key="object" ref="485408925"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="271746474"/>
+							<reference ref="145559693"/>
+							<reference ref="476546682"/>
+							<reference ref="683208530"/>
+							<reference ref="567275781"/>
+							<reference ref="971852303"/>
+							<reference ref="421164362"/>
+							<reference ref="372292189"/>
+						</array>
+						<reference key="parent" ref="565610698"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">D2l-4I-GKa</string>
+						<reference key="object" ref="271746474"/>
+						<reference key="parent" ref="485408925"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">rv0-EH-lPj</string>
+						<reference key="object" ref="145559693"/>
+						<reference key="parent" ref="485408925"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">sGf-4f-QUu</string>
+						<reference key="object" ref="476546682"/>
+						<reference key="parent" ref="485408925"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">Fct-0j-ck4</string>
+						<reference key="object" ref="683208530"/>
+						<reference key="parent" ref="485408925"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">u1T-CX-dx3</string>
+						<reference key="object" ref="567275781"/>
+						<reference key="parent" ref="485408925"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">c7b-hr-jQv</string>
+						<reference key="object" ref="971852303"/>
+						<reference key="parent" ref="485408925"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">LHC-3N-tJv</string>
+						<reference key="object" ref="421164362"/>
+						<reference key="parent" ref="485408925"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">Kk3-QH-mmH</string>
+						<reference key="object" ref="372292189"/>
+						<reference key="parent" ref="485408925"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">KPx-re-8EE</string>
+						<reference key="object" ref="344418183"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="655178834"/>
+						</array>
+						<reference key="parent" ref="565667192"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">UYw-Xs-8vf</string>
+						<reference key="object" ref="655178834"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="119758306"/>
+							<reference ref="677476051"/>
+							<reference ref="862457551"/>
+							<reference ref="20635564"/>
+							<reference ref="399282874"/>
+							<reference ref="121594454"/>
+						</array>
+						<reference key="parent" ref="344418183"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">Es7-1o-KcI</string>
+						<reference key="object" ref="119758306"/>
+						<reference key="parent" ref="655178834"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">oqd-zp-I6d</string>
+						<reference key="object" ref="677476051"/>
+						<reference key="parent" ref="655178834"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">1zB-4V-BF2</string>
+						<reference key="object" ref="862457551"/>
+						<reference key="parent" ref="655178834"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">Wgq-So-DN8</string>
+						<reference key="object" ref="20635564"/>
+						<reference key="parent" ref="655178834"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">fCE-bz-bNv</string>
+						<reference key="object" ref="399282874"/>
+						<reference key="parent" ref="655178834"/>
+					</object>
+					<object class="IBObjectRecord">
+						<string key="id">05T-H3-24V</string>
+						<reference key="object" ref="121594454"/>
+						<reference key="parent" ref="655178834"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -4805,6 +5139,7 @@
 				<boolean value="NO" key="-2.showNotes"/>
 				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="-3.showNotes"/>
+				<string key="05T-H3-24V.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="0ww-n8-YRC.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="0ww-n8-YRC.showNotes"/>
 				<string key="1000.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -5059,20 +5394,11 @@
 				<boolean value="NO" key="173.showNotes"/>
 				<string key="174.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="174.showNotes"/>
-				<string key="184.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="184.showNotes"/>
-				<string key="185.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="185.showNotes"/>
-				<string key="187.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="187.showNotes"/>
-				<string key="189.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="189.showNotes"/>
 				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="19.showNotes"/>
-				<string key="191.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="191.showNotes"/>
 				<string key="199.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="199.showNotes"/>
+				<string key="1zB-4V-BF2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="213.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="213.showNotes"/>
 				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -5426,9 +5752,29 @@
 				</object>
 				<string key="998.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="998.showNotes"/>
+				<string key="D2l-4I-GKa.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="Es7-1o-KcI.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="Fct-0j-ck4.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="JtW-Ko-SuZ.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="KPx-re-8EE.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="Kk3-QH-mmH.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="LHC-3N-tJv.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="UYw-Xs-8vf.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="Wgq-So-DN8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="YwR-Sa-nn5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="Yzp-Qk-v7Y.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="c7b-hr-jQv.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="elh-eq-jVU.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="fCE-bz-bNv.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="mGA-xh-Uwq.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="nXE-rI-RyI.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="oqd-zp-I6d.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="qK5-Ty-Uao.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="rv0-EH-lPj.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="sGf-4f-QUu.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="tMm-qx-zUV.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="u1T-CX-dx3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="zbw-kN-6gM.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
diff --git a/Source/SPTextView.m b/Source/SPTextView.m
index 12d6ed13..e37b5939 100644
--- a/Source/SPTextView.m
+++ b/Source/SPTextView.m
@@ -3203,18 +3203,16 @@ static inline NSPoint SPPointOnLine(NSPoint a, NSPoint b, CGFloat t) { return NS
  */
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem 
 {
-
-	// Enable or disable the search in the MySQL help menu item depending on whether there is a 
+	// Enable or disable the search in the MySQL help menu item depending on whether there is a
 	// selection and whether it is a reasonable length.
 	if ([menuItem action] == @selector(showMySQLHelpForCurrentWord:)) {
-    if ([self selectedRange].length > 0) {
-      [menuItem setTitle:NSLocalizedString(@"MySQL Help for Selection", @"MySQL Help for Selection")];
-    } else {
-      [menuItem setTitle: NSLocalizedString(@"MySQL Help for Word", @"MySQL Help for Word")];
-    }
-    
+		if ([self selectedRange].length > 0) {
+			[menuItem setTitle:NSLocalizedString(@"MySQL Help for Selection", @"MySQL Help for Selection")];
+		} else {
+			[menuItem setTitle: NSLocalizedString(@"MySQL Help for Word", @"MySQL Help for Word")];
+		}
 		NSUInteger stringSize = [self getRangeForCurrentWord].length;
-		return (stringSize || stringSize > 64);
+		return (0 < stringSize && stringSize < 65); // 1 ≤ stringSize ≤ 64
 	}
 	// Enable Copy as RTF if something is selected
 	if ([menuItem action] == @selector(copyAsRTF)) {
@@ -3231,7 +3229,7 @@ static inline NSPoint SPPointOnLine(NSPoint a, NSPoint b, CGFloat t) { return NS
 		return NO;
 	}
 
-	return YES;
+	return [super validateMenuItem:menuItem];
 }
 
 /**