From e80c61444c0446dcb052bd26d2eef207b97cea4e Mon Sep 17 00:00:00 2001
From: stuconnolly <stuart02@gmail.com>
Date: Sun, 17 May 2009 23:35:25 +0000
Subject: Add the ability to rename tables. This could potentially be enhanced
 to allowing renaming views, which is supported as of MySQL version 5.0.14,
 but requires some version detection to take place.

---
 Interfaces/English.lproj/DBView.xib          | 876 ++++++++++++++++++---------
 Interfaces/English.lproj/Localizable.strings | Bin 21574 -> 46506 bytes
 Source/TablesList.h                          |   8 +-
 Source/TablesList.m                          |  78 ++-
 4 files changed, 672 insertions(+), 290 deletions(-)

diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index bc1f27b1..ca3a6dfa 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -8,7 +8,7 @@
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="3948"/>
+			<integer value="5675"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -176,7 +176,6 @@
 															</object>
 															<string key="NSFrame">{{1, 1}, {212, 393}}</string>
 															<reference key="NSSuperview" ref="233472824"/>
-															<reference key="NSNextKeyView" ref="251040077"/>
 															<reference key="NSDocView" ref="251040077"/>
 															<object class="NSColor" key="NSBGColor" id="1024678221">
 																<int key="NSColorSpace">6</int>
@@ -208,7 +207,6 @@
 													</object>
 													<string key="NSFrameSize">{214, 395}</string>
 													<reference key="NSSuperview" ref="355288374"/>
-													<reference key="NSNextKeyView" ref="73685676"/>
 													<int key="NSsFlags">530</int>
 													<reference key="NSVScroller" ref="693168867"/>
 													<reference key="NSHScroller" ref="656188692"/>
@@ -293,7 +291,6 @@
 															</object>
 															<string key="NSFrame">{{1, 1}, {212, 123}}</string>
 															<reference key="NSSuperview" ref="298226231"/>
-															<reference key="NSNextKeyView" ref="347093764"/>
 															<reference key="NSDocView" ref="347093764"/>
 															<reference key="NSBGColor" ref="1024678221"/>
 															<int key="NScvFlags">4</int>
@@ -320,7 +317,6 @@
 													</object>
 													<string key="NSFrame">{{0, 404}, {214, 125}}</string>
 													<reference key="NSSuperview" ref="355288374"/>
-													<reference key="NSNextKeyView" ref="685057119"/>
 													<int key="NSsFlags">530</int>
 													<reference key="NSVScroller" ref="245346414"/>
 													<reference key="NSHScroller" ref="353686052"/>
@@ -387,7 +383,10 @@
 													<string key="NSKeyEquiv"/>
 													<int key="NSKeyEquivModMask">1048576</int>
 													<int key="NSMnemonicLoc">2147483647</int>
-													<reference key="NSImage" ref="654575920"/>
+													<object class="NSCustomResource" key="NSImage" id="535711902">
+														<string key="NSClassName">NSImage</string>
+														<string key="NSResourceName">button_action</string>
+													</object>
 													<string key="NSAction">_popUpItemAction:</string>
 													<reference key="NSTarget" ref="753352469"/>
 												</object>
@@ -397,22 +396,32 @@
 													<object class="NSMutableArray" key="NSMenuItems">
 														<bool key="EncodedWithXMLCoder">YES</bool>
 														<reference ref="486381768"/>
-														<object class="NSMenuItem" id="924446696">
+														<object class="NSMenuItem" id="938900701">
 															<reference key="NSMenu" ref="23713489"/>
-															<string key="NSTitle">Duplicate Table</string>
+															<string key="NSTitle">Rename Table</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<object class="NSCustomResource" key="NSOnImage" id="594889092">
+															<object class="NSCustomResource" key="NSOnImage" id="285877316">
 																<string key="NSClassName">NSImage</string>
 																<string key="NSResourceName">NSMenuCheckmark</string>
 															</object>
-															<object class="NSCustomResource" key="NSMixedImage" id="515625830">
+															<object class="NSCustomResource" key="NSMixedImage" id="800099743">
 																<string key="NSClassName">NSImage</string>
 																<string key="NSResourceName">NSMenuMixedState</string>
 															</object>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="753352469"/>
 														</object>
+														<object class="NSMenuItem" id="924446696">
+															<reference key="NSMenu" ref="23713489"/>
+															<string key="NSTitle">Duplicate Table</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="285877316"/>
+															<reference key="NSMixedImage" ref="800099743"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="753352469"/>
+														</object>
 														<object class="NSMenuItem" id="684779453">
 															<reference key="NSMenu" ref="23713489"/>
 															<bool key="NSIsDisabled">YES</bool>
@@ -420,8 +429,8 @@
 															<string key="NSTitle"/>
 															<string key="NSKeyEquiv"/>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="594889092"/>
-															<reference key="NSMixedImage" ref="515625830"/>
+															<reference key="NSOnImage" ref="285877316"/>
+															<reference key="NSMixedImage" ref="800099743"/>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="753352469"/>
 														</object>
@@ -431,8 +440,8 @@
 															<string key="NSKeyEquiv"/>
 															<int key="NSKeyEquivModMask">1048576</int>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="594889092"/>
-															<reference key="NSMixedImage" ref="515625830"/>
+															<reference key="NSOnImage" ref="285877316"/>
+															<reference key="NSMixedImage" ref="800099743"/>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="753352469"/>
 														</object>
@@ -619,8 +628,8 @@
 																						<int key="NSKeyEquivModMask">1048576</int>
 																						<int key="NSMnemonicLoc">2147483647</int>
 																						<int key="NSState">1</int>
-																						<reference key="NSOnImage" ref="594889092"/>
-																						<reference key="NSMixedImage" ref="515625830"/>
+																						<reference key="NSOnImage" ref="285877316"/>
+																						<reference key="NSMixedImage" ref="800099743"/>
 																						<string key="NSAction">_popUpItemAction:</string>
 																						<reference key="NSTarget" ref="126755904"/>
 																					</object>
@@ -638,8 +647,8 @@
 																								<string key="NSKeyEquiv"/>
 																								<int key="NSKeyEquivModMask">1048576</int>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<reference key="NSTarget" ref="126755904"/>
 																							</object>
@@ -649,8 +658,8 @@
 																								<string key="NSKeyEquiv"/>
 																								<int key="NSKeyEquivModMask">1048576</int>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<reference key="NSTarget" ref="126755904"/>
 																							</object>
@@ -660,8 +669,8 @@
 																								<string key="NSKeyEquiv"/>
 																								<int key="NSKeyEquivModMask">1048576</int>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<reference key="NSTarget" ref="126755904"/>
 																							</object>
@@ -671,8 +680,8 @@
 																								<string key="NSKeyEquiv"/>
 																								<int key="NSKeyEquivModMask">1048576</int>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<reference key="NSTarget" ref="126755904"/>
 																							</object>
@@ -2070,8 +2079,8 @@
 																		<int key="NSKeyEquivModMask">1048576</int>
 																		<int key="NSMnemonicLoc">2147483647</int>
 																		<int key="NSState">1</int>
-																		<reference key="NSOnImage" ref="594889092"/>
-																		<reference key="NSMixedImage" ref="515625830"/>
+																		<reference key="NSOnImage" ref="285877316"/>
+																		<reference key="NSMixedImage" ref="800099743"/>
 																		<string key="NSAction">_popUpItemAction:</string>
 																		<reference key="NSTarget" ref="376863254"/>
 																	</object>
@@ -2117,8 +2126,8 @@
 																		<int key="NSKeyEquivModMask">1048576</int>
 																		<int key="NSMnemonicLoc">2147483647</int>
 																		<int key="NSState">1</int>
-																		<reference key="NSOnImage" ref="594889092"/>
-																		<reference key="NSMixedImage" ref="515625830"/>
+																		<reference key="NSOnImage" ref="285877316"/>
+																		<reference key="NSMixedImage" ref="800099743"/>
 																		<string key="NSAction">_popUpItemAction:</string>
 																		<reference key="NSTarget" ref="105542136"/>
 																	</object>
@@ -2877,8 +2886,8 @@
 																								<string key="NSKeyEquiv"/>
 																								<int key="NSKeyEquivModMask">1048576</int>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<reference key="NSTarget" ref="416049103"/>
 																							</object>
@@ -2888,8 +2897,8 @@
 																								<string key="NSKeyEquiv"/>
 																								<int key="NSKeyEquivModMask">1048576</int>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<reference key="NSTarget" ref="416049103"/>
 																							</object>
@@ -2901,8 +2910,8 @@
 																								<string key="NSKeyEquiv"/>
 																								<int key="NSKeyEquivModMask">1048576</int>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<reference key="NSTarget" ref="416049103"/>
 																							</object>
@@ -2928,10 +2937,7 @@
 																					<reference key="NSControlView" ref="363916571"/>
 																					<int key="NSButtonFlags">-2042609409</int>
 																					<int key="NSButtonFlags2">35</int>
-																					<object class="NSCustomResource" key="NSNormalImage">
-																						<string key="NSClassName">NSImage</string>
-																						<string key="NSResourceName">button_action</string>
-																					</object>
+																					<reference key="NSNormalImage" ref="654575920"/>
 																					<string key="NSAlternateContents"/>
 																					<string key="NSKeyEquivalent"/>
 																					<int key="NSPeriodicDelay">400</int>
@@ -2943,7 +2949,7 @@
 																						<string key="NSKeyEquiv"/>
 																						<int key="NSKeyEquivModMask">1048576</int>
 																						<int key="NSMnemonicLoc">2147483647</int>
-																						<reference key="NSImage" ref="654575920"/>
+																						<reference key="NSImage" ref="535711902"/>
 																						<string key="NSAction">_popUpItemAction:</string>
 																						<reference key="NSTarget" ref="984501775"/>
 																					</object>
@@ -2959,8 +2965,8 @@
 																								<string key="NSKeyEquiv">r</string>
 																								<int key="NSKeyEquivModMask">1048576</int>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<int key="NSTag">1</int>
 																								<reference key="NSTarget" ref="984501775"/>
@@ -2972,8 +2978,8 @@
 																								<string key="NSKeyEquiv">r</string>
 																								<int key="NSKeyEquivModMask">1572864</int>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<int key="NSTag">2</int>
 																								<reference key="NSTarget" ref="984501775"/>
@@ -2985,8 +2991,8 @@
 																								<string key="NSTitle"/>
 																								<string key="NSKeyEquiv"/>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<reference key="NSTarget" ref="984501775"/>
 																							</object>
@@ -2997,8 +3003,8 @@
 																								<string type="base64-UTF8" key="NSKeyEquiv">75yAA</string>
 																								<int key="NSKeyEquivModMask">262144</int>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<int key="NSTag">3</int>
 																								<reference key="NSTarget" ref="984501775"/>
@@ -3010,8 +3016,8 @@
 																								<string type="base64-UTF8" key="NSKeyEquiv">75yBA</string>
 																								<int key="NSKeyEquivModMask">262144</int>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<int key="NSTag">4</int>
 																								<reference key="NSTarget" ref="984501775"/>
@@ -3021,8 +3027,8 @@
 																								<string key="NSTitle">Clear History</string>
 																								<string key="NSKeyEquiv"/>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<int key="NSTag">5</int>
 																								<reference key="NSTarget" ref="984501775"/>
@@ -3034,8 +3040,8 @@
 																								<string key="NSTitle"/>
 																								<string key="NSKeyEquiv"/>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<reference key="NSTarget" ref="984501775"/>
 																							</object>
@@ -3045,8 +3051,8 @@
 																								<string key="NSKeyEquiv">]</string>
 																								<int key="NSKeyEquivModMask">1048576</int>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<int key="NSTag">6</int>
 																								<reference key="NSTarget" ref="984501775"/>
@@ -3057,8 +3063,8 @@
 																								<string key="NSKeyEquiv">[</string>
 																								<int key="NSKeyEquivModMask">1048576</int>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<int key="NSTag">7</int>
 																								<reference key="NSTarget" ref="984501775"/>
@@ -3068,8 +3074,8 @@
 																								<string key="NSTitle">Completion List</string>
 																								<string type="base64-UTF8" key="NSKeyEquiv">Gw</string>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<int key="NSTag">8</int>
 																								<reference key="NSTarget" ref="984501775"/>
@@ -3081,8 +3087,8 @@
 																								<string key="NSTitle"/>
 																								<string key="NSKeyEquiv"/>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<reference key="NSTarget" ref="984501775"/>
 																							</object>
@@ -3091,8 +3097,8 @@
 																								<string key="NSTitle">Editor Font...</string>
 																								<string key="NSKeyEquiv"/>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<reference key="NSTarget" ref="984501775"/>
 																							</object>
@@ -3102,8 +3108,8 @@
 																								<string key="NSKeyEquiv"/>
 																								<int key="NSMnemonicLoc">2147483647</int>
 																								<int key="NSState">1</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<int key="NSTag">9</int>
 																								<reference key="NSTarget" ref="984501775"/>
@@ -3114,8 +3120,8 @@
 																								<string key="NSKeyEquiv"/>
 																								<int key="NSMnemonicLoc">2147483647</int>
 																								<int key="NSState">1</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<int key="NSTag">10</int>
 																								<reference key="NSTarget" ref="984501775"/>
@@ -3125,8 +3131,8 @@
 																								<string key="NSTitle">Auto-uppercase Keywords</string>
 																								<string key="NSKeyEquiv"/>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<reference key="NSTarget" ref="984501775"/>
 																							</object>
@@ -3135,8 +3141,8 @@
 																								<string key="NSTitle">Update Help while typing</string>
 																								<string key="NSKeyEquiv"/>
 																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="594889092"/>
-																								<reference key="NSMixedImage" ref="515625830"/>
+																								<reference key="NSOnImage" ref="285877316"/>
+																								<reference key="NSMixedImage" ref="800099743"/>
 																								<string key="NSAction">_popUpItemAction:</string>
 																								<reference key="NSTarget" ref="984501775"/>
 																							</object>
@@ -3909,7 +3915,6 @@
 																		</object>
 																		<string key="NSFrame">{{1, 17}, {688, 454}}</string>
 																		<reference key="NSSuperview" ref="717203719"/>
-																		<reference key="NSNextKeyView" ref="952375340"/>
 																		<reference key="NSDocView" ref="952375340"/>
 																		<reference key="NSBGColor" ref="1024678221"/>
 																		<int key="NScvFlags">2</int>
@@ -3942,7 +3947,6 @@
 																		</object>
 																		<string key="NSFrame">{{1, 0}, {688, 17}}</string>
 																		<reference key="NSSuperview" ref="717203719"/>
-																		<reference key="NSNextKeyView" ref="370758200"/>
 																		<reference key="NSDocView" ref="370758200"/>
 																		<reference key="NSBGColor" ref="1024678221"/>
 																		<int key="NScvFlags">4</int>
@@ -3951,7 +3955,6 @@
 																</object>
 																<string key="NSFrame">{{6, 32}, {690, 472}}</string>
 																<reference key="NSSuperview" ref="49633996"/>
-																<reference key="NSNextKeyView" ref="705580858"/>
 																<int key="NSsFlags">562</int>
 																<reference key="NSVScroller" ref="429193901"/>
 																<reference key="NSHScroller" ref="257349323"/>
@@ -5402,8 +5405,8 @@
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<int key="NSState">1</int>
-									<reference key="NSOnImage" ref="594889092"/>
-									<reference key="NSMixedImage" ref="515625830"/>
+									<reference key="NSOnImage" ref="285877316"/>
+									<reference key="NSMixedImage" ref="800099743"/>
 									<string key="NSAction">_popUpItemAction:</string>
 									<reference key="NSTarget" ref="1000126742"/>
 								</object>
@@ -5421,8 +5424,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5432,8 +5435,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5443,8 +5446,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5456,8 +5459,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5467,8 +5470,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5478,8 +5481,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5489,8 +5492,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5502,8 +5505,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5513,8 +5516,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5524,8 +5527,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5537,8 +5540,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5548,8 +5551,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5559,8 +5562,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5570,8 +5573,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5581,8 +5584,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5594,8 +5597,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5605,8 +5608,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5618,8 +5621,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5629,8 +5632,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5642,8 +5645,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5653,8 +5656,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5664,8 +5667,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5675,8 +5678,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -5685,8 +5688,8 @@
 											<string key="NSTitle">EUC-KR Korean (euckr)</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1000126742"/>
 										</object>
@@ -7144,8 +7147,8 @@
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<int key="NSState">1</int>
-									<reference key="NSOnImage" ref="594889092"/>
-									<reference key="NSMixedImage" ref="515625830"/>
+									<reference key="NSOnImage" ref="285877316"/>
+									<reference key="NSMixedImage" ref="800099743"/>
 									<string key="NSAction">_popUpItemAction:</string>
 									<reference key="NSTarget" ref="435559245"/>
 								</object>
@@ -7163,8 +7166,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="435559245"/>
 										</object>
@@ -7174,8 +7177,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="435559245"/>
 										</object>
@@ -7185,8 +7188,8 @@
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="435559245"/>
 										</object>
@@ -7447,8 +7450,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<int key="NSState">1</int>
-									<reference key="NSOnImage" ref="594889092"/>
-									<reference key="NSMixedImage" ref="515625830"/>
+									<reference key="NSOnImage" ref="285877316"/>
+									<reference key="NSMixedImage" ref="800099743"/>
 									<string key="NSAction">_popUpItemAction:</string>
 									<reference key="NSTarget" ref="1007861376"/>
 								</object>
@@ -7466,8 +7469,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1007861376"/>
 										</object>
@@ -7477,8 +7480,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1007861376"/>
 										</object>
@@ -7488,8 +7491,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="1007861376"/>
 										</object>
@@ -8047,7 +8050,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSWindowContentMinSize">{300, 200}</string>
 				<object class="NSView" key="NSWindowView" id="226131408">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -8247,7 +8250,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						</object>
 					</object>
 					<string key="NSFrameSize">{411, 341}</string>
-					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMinSize">{300, 222}</string>
@@ -8349,7 +8351,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<reference key="NSSuperview" ref="846512394"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="463047609">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">-2080244224</int>
 								<int key="NSCellFlags2">138018816</int>
 								<string key="NSContents">Cancel</string>
 								<reference key="NSSupport" ref="26"/>
@@ -8390,8 +8392,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<int key="NSState">1</int>
-									<reference key="NSOnImage" ref="594889092"/>
-									<reference key="NSMixedImage" ref="515625830"/>
+									<reference key="NSOnImage" ref="285877316"/>
+									<reference key="NSMixedImage" ref="800099743"/>
 									<string key="NSAction">_popUpItemAction:</string>
 									<reference key="NSTarget" ref="285868883"/>
 								</object>
@@ -8409,8 +8411,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8420,8 +8422,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8431,8 +8433,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8444,8 +8446,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8455,8 +8457,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8466,8 +8468,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8477,8 +8479,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8490,8 +8492,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8501,8 +8503,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8512,8 +8514,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8525,8 +8527,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8536,8 +8538,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8547,8 +8549,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8558,8 +8560,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8569,8 +8571,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8582,8 +8584,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8593,8 +8595,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8606,8 +8608,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8617,8 +8619,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8630,8 +8632,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8641,8 +8643,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8652,8 +8654,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8663,8 +8665,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8673,8 +8675,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<string key="NSTitle">EUC-KR Korean (euckr)</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="594889092"/>
-											<reference key="NSMixedImage" ref="515625830"/>
+											<reference key="NSOnImage" ref="285877316"/>
+											<reference key="NSMixedImage" ref="800099743"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="285868883"/>
 										</object>
@@ -8741,8 +8743,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 													<int key="NSKeyEquivModMask">1048576</int>
 													<int key="NSMnemonicLoc">2147483647</int>
 													<int key="NSState">1</int>
-													<reference key="NSOnImage" ref="594889092"/>
-													<reference key="NSMixedImage" ref="515625830"/>
+													<reference key="NSOnImage" ref="285877316"/>
+													<reference key="NSMixedImage" ref="800099743"/>
 													<string key="NSAction">_popUpItemAction:</string>
 													<reference key="NSTarget" ref="535836876"/>
 												</object>
@@ -8758,8 +8760,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSKeyEquivModMask">1048576</int>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="594889092"/>
-															<reference key="NSMixedImage" ref="515625830"/>
+															<reference key="NSOnImage" ref="285877316"/>
+															<reference key="NSMixedImage" ref="800099743"/>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="535836876"/>
 														</object>
@@ -8769,8 +8771,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSKeyEquivModMask">1048576</int>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="594889092"/>
-															<reference key="NSMixedImage" ref="515625830"/>
+															<reference key="NSOnImage" ref="285877316"/>
+															<reference key="NSMixedImage" ref="800099743"/>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="535836876"/>
 														</object>
@@ -8857,8 +8859,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 													<int key="NSKeyEquivModMask">1048576</int>
 													<int key="NSMnemonicLoc">2147483647</int>
 													<int key="NSState">1</int>
-													<reference key="NSOnImage" ref="594889092"/>
-													<reference key="NSMixedImage" ref="515625830"/>
+													<reference key="NSOnImage" ref="285877316"/>
+													<reference key="NSMixedImage" ref="800099743"/>
 													<string key="NSAction">_popUpItemAction:</string>
 													<reference key="NSTarget" ref="431726441"/>
 												</object>
@@ -8874,8 +8876,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSKeyEquivModMask">1048576</int>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="594889092"/>
-															<reference key="NSMixedImage" ref="515625830"/>
+															<reference key="NSOnImage" ref="285877316"/>
+															<reference key="NSMixedImage" ref="800099743"/>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="431726441"/>
 														</object>
@@ -8885,8 +8887,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSKeyEquivModMask">1048576</int>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="594889092"/>
-															<reference key="NSMixedImage" ref="515625830"/>
+															<reference key="NSOnImage" ref="285877316"/>
+															<reference key="NSMixedImage" ref="800099743"/>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="431726441"/>
 														</object>
@@ -8895,8 +8897,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 															<string key="NSTitle">Cascade</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="594889092"/>
-															<reference key="NSMixedImage" ref="515625830"/>
+															<reference key="NSOnImage" ref="285877316"/>
+															<reference key="NSMixedImage" ref="800099743"/>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="431726441"/>
 														</object>
@@ -8905,8 +8907,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 															<string key="NSTitle">Delete</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="594889092"/>
-															<reference key="NSMixedImage" ref="515625830"/>
+															<reference key="NSOnImage" ref="285877316"/>
+															<reference key="NSMixedImage" ref="800099743"/>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="431726441"/>
 														</object>
@@ -8942,8 +8944,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 													<int key="NSKeyEquivModMask">1048576</int>
 													<int key="NSMnemonicLoc">2147483647</int>
 													<int key="NSState">1</int>
-													<reference key="NSOnImage" ref="594889092"/>
-													<reference key="NSMixedImage" ref="515625830"/>
+													<reference key="NSOnImage" ref="285877316"/>
+													<reference key="NSMixedImage" ref="800099743"/>
 													<string key="NSAction">_popUpItemAction:</string>
 													<reference key="NSTarget" ref="181520855"/>
 												</object>
@@ -8959,8 +8961,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSKeyEquivModMask">1048576</int>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="594889092"/>
-															<reference key="NSMixedImage" ref="515625830"/>
+															<reference key="NSOnImage" ref="285877316"/>
+															<reference key="NSMixedImage" ref="800099743"/>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="181520855"/>
 														</object>
@@ -8970,8 +8972,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSKeyEquivModMask">1048576</int>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="594889092"/>
-															<reference key="NSMixedImage" ref="515625830"/>
+															<reference key="NSOnImage" ref="285877316"/>
+															<reference key="NSMixedImage" ref="800099743"/>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="181520855"/>
 														</object>
@@ -8980,8 +8982,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 															<string key="NSTitle">Cascade</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="594889092"/>
-															<reference key="NSMixedImage" ref="515625830"/>
+															<reference key="NSOnImage" ref="285877316"/>
+															<reference key="NSMixedImage" ref="800099743"/>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="181520855"/>
 														</object>
@@ -8990,8 +8992,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 															<string key="NSTitle">Delete</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="594889092"/>
-															<reference key="NSMixedImage" ref="515625830"/>
+															<reference key="NSOnImage" ref="285877316"/>
+															<reference key="NSMixedImage" ref="800099743"/>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="181520855"/>
 														</object>
@@ -9094,8 +9096,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 													<int key="NSKeyEquivModMask">1048576</int>
 													<int key="NSMnemonicLoc">2147483647</int>
 													<int key="NSState">1</int>
-													<reference key="NSOnImage" ref="594889092"/>
-													<reference key="NSMixedImage" ref="515625830"/>
+													<reference key="NSOnImage" ref="285877316"/>
+													<reference key="NSMixedImage" ref="800099743"/>
 													<string key="NSAction">_popUpItemAction:</string>
 													<reference key="NSTarget" ref="141679483"/>
 												</object>
@@ -9111,8 +9113,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSKeyEquivModMask">1048576</int>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="594889092"/>
-															<reference key="NSMixedImage" ref="515625830"/>
+															<reference key="NSOnImage" ref="285877316"/>
+															<reference key="NSMixedImage" ref="800099743"/>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="141679483"/>
 														</object>
@@ -9122,8 +9124,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSKeyEquivModMask">1048576</int>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="594889092"/>
-															<reference key="NSMixedImage" ref="515625830"/>
+															<reference key="NSOnImage" ref="285877316"/>
+															<reference key="NSMixedImage" ref="800099743"/>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="141679483"/>
 														</object>
@@ -9159,8 +9161,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 													<int key="NSKeyEquivModMask">1048576</int>
 													<int key="NSMnemonicLoc">2147483647</int>
 													<int key="NSState">1</int>
-													<reference key="NSOnImage" ref="594889092"/>
-													<reference key="NSMixedImage" ref="515625830"/>
+													<reference key="NSOnImage" ref="285877316"/>
+													<reference key="NSMixedImage" ref="800099743"/>
 													<string key="NSAction">_popUpItemAction:</string>
 													<reference key="NSTarget" ref="980368532"/>
 												</object>
@@ -9176,8 +9178,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSKeyEquivModMask">1048576</int>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="594889092"/>
-															<reference key="NSMixedImage" ref="515625830"/>
+															<reference key="NSOnImage" ref="285877316"/>
+															<reference key="NSMixedImage" ref="800099743"/>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="980368532"/>
 														</object>
@@ -9187,8 +9189,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSKeyEquivModMask">1048576</int>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="594889092"/>
-															<reference key="NSMixedImage" ref="515625830"/>
+															<reference key="NSOnImage" ref="285877316"/>
+															<reference key="NSMixedImage" ref="800099743"/>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="980368532"/>
 														</object>
@@ -9224,8 +9226,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 													<int key="NSKeyEquivModMask">1048576</int>
 													<int key="NSMnemonicLoc">2147483647</int>
 													<int key="NSState">1</int>
-													<reference key="NSOnImage" ref="594889092"/>
-													<reference key="NSMixedImage" ref="515625830"/>
+													<reference key="NSOnImage" ref="285877316"/>
+													<reference key="NSMixedImage" ref="800099743"/>
 													<string key="NSAction">_popUpItemAction:</string>
 													<reference key="NSTarget" ref="949968790"/>
 												</object>
@@ -9241,8 +9243,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSKeyEquivModMask">1048576</int>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="594889092"/>
-															<reference key="NSMixedImage" ref="515625830"/>
+															<reference key="NSOnImage" ref="285877316"/>
+															<reference key="NSMixedImage" ref="800099743"/>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="949968790"/>
 														</object>
@@ -9252,8 +9254,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSKeyEquivModMask">1048576</int>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="594889092"/>
-															<reference key="NSMixedImage" ref="515625830"/>
+															<reference key="NSOnImage" ref="285877316"/>
+															<reference key="NSMixedImage" ref="800099743"/>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="949968790"/>
 														</object>
@@ -9368,6 +9370,108 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 			</object>
+			<object class="NSWindowTemplate" id="399092485">
+				<int key="NSWindowStyleMask">1</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{343, 483}, {269, 112}}</string>
+				<int key="NSWTFlags">1886912512</int>
+				<string key="NSWindowTitle">tableSheet</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<string key="NSWindowContentMaxSize">{269, 112}</string>
+				<string key="NSWindowContentMinSize">{269, 112}</string>
+				<object class="NSView" key="NSWindowView" id="44272488">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<object class="NSMutableArray" key="NSSubviews">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSTextField" id="731300775">
+							<reference key="NSNextResponder" ref="44272488"/>
+							<int key="NSvFlags">256</int>
+							<string key="NSFrame">{{17, 78}, {235, 14}}</string>
+							<reference key="NSSuperview" ref="44272488"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="487237473">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">4194304</int>
+								<string key="NSContents">Rename table %@ to:</string>
+								<reference key="NSSupport" ref="26"/>
+								<reference key="NSControlView" ref="731300775"/>
+								<reference key="NSBackgroundColor" ref="62854682"/>
+								<reference key="NSTextColor" ref="454249633"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="272856728">
+							<reference key="NSNextResponder" ref="44272488"/>
+							<int key="NSvFlags">258</int>
+							<string key="NSFrame">{{20, 52}, {229, 18}}</string>
+							<reference key="NSSuperview" ref="44272488"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="859957158">
+								<int key="NSCellFlags">-1804468671</int>
+								<int key="NSCellFlags2">4326400</int>
+								<string key="NSContents"/>
+								<reference key="NSSupport" ref="26"/>
+								<reference key="NSControlView" ref="272856728"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<reference key="NSBackgroundColor" ref="480189472"/>
+								<reference key="NSTextColor" ref="690893883"/>
+							</object>
+						</object>
+						<object class="NSButton" id="994798282">
+							<reference key="NSNextResponder" ref="44272488"/>
+							<int key="NSvFlags">259</int>
+							<string key="NSFrame">{{172, 13}, {82, 28}}</string>
+							<reference key="NSSuperview" ref="44272488"/>
+							<int key="NSTag">1</int>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="825486974">
+								<int key="NSCellFlags">604110336</int>
+								<int key="NSCellFlags2">138018816</int>
+								<string key="NSContents">Rename</string>
+								<reference key="NSSupport" ref="26"/>
+								<int key="NSTag">1</int>
+								<reference key="NSControlView" ref="994798282"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="932958253"/>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="88145988">
+							<reference key="NSNextResponder" ref="44272488"/>
+							<int key="NSvFlags">259</int>
+							<string key="NSFrame">{{92, 13}, {82, 28}}</string>
+							<reference key="NSSuperview" ref="44272488"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="875831639">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">138018816</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="26"/>
+								<reference key="NSControlView" ref="88145988"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="932958253"/>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+					</object>
+					<string key="NSFrameSize">{269, 112}</string>
+					<reference key="NSSuperview"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
+				<string key="NSMinSize">{269, 134}</string>
+				<string key="NSMaxSize">{269, 134}</string>
+			</object>
 			<object class="NSCustomView" id="139279766">
 				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
@@ -11377,8 +11481,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 								<int key="NSKeyEquivModMask">1048576</int>
 								<int key="NSMnemonicLoc">2147483647</int>
 								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="594889092"/>
-								<reference key="NSMixedImage" ref="515625830"/>
+								<reference key="NSOnImage" ref="285877316"/>
+								<reference key="NSMixedImage" ref="800099743"/>
 								<string key="NSAction">_popUpItemAction:</string>
 								<reference key="NSTarget" ref="689765086"/>
 							</object>
@@ -11394,8 +11498,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 										<string key="NSKeyEquiv"/>
 										<int key="NSKeyEquivModMask">1048576</int>
 										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="594889092"/>
-										<reference key="NSMixedImage" ref="515625830"/>
+										<reference key="NSOnImage" ref="285877316"/>
+										<reference key="NSMixedImage" ref="800099743"/>
 										<string key="NSAction">_popUpItemAction:</string>
 										<reference key="NSTarget" ref="689765086"/>
 									</object>
@@ -11459,8 +11563,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 								<int key="NSKeyEquivModMask">1048576</int>
 								<int key="NSMnemonicLoc">2147483647</int>
 								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="594889092"/>
-								<reference key="NSMixedImage" ref="515625830"/>
+								<reference key="NSOnImage" ref="285877316"/>
+								<reference key="NSMixedImage" ref="800099743"/>
 								<string key="NSAction">_popUpItemAction:</string>
 								<reference key="NSTarget" ref="931032347"/>
 							</object>
@@ -11477,8 +11581,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 										<string key="NSTitle"/>
 										<string key="NSKeyEquiv"/>
 										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="594889092"/>
-										<reference key="NSMixedImage" ref="515625830"/>
+										<reference key="NSOnImage" ref="285877316"/>
+										<reference key="NSMixedImage" ref="800099743"/>
 										<string key="NSAction">_popUpItemAction:</string>
 										<reference key="NSTarget" ref="931032347"/>
 									</object>
@@ -11487,8 +11591,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 										<string type="base64-UTF8" key="NSTitle">QWRkIERhdGFiYXNl4oCmA</string>
 										<string key="NSKeyEquiv"/>
 										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="594889092"/>
-										<reference key="NSMixedImage" ref="515625830"/>
+										<reference key="NSOnImage" ref="285877316"/>
+										<reference key="NSMixedImage" ref="800099743"/>
 										<string key="NSAction">_popUpItemAction:</string>
 										<reference key="NSTarget" ref="931032347"/>
 									</object>
@@ -11500,8 +11604,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 										<string key="NSKeyEquiv"/>
 										<int key="NSMnemonicLoc">2147483647</int>
 										<int key="NSState">1</int>
-										<reference key="NSOnImage" ref="594889092"/>
-										<reference key="NSMixedImage" ref="515625830"/>
+										<reference key="NSOnImage" ref="285877316"/>
+										<reference key="NSMixedImage" ref="800099743"/>
 										<string key="NSAction">_popUpItemAction:</string>
 										<reference key="NSTarget" ref="931032347"/>
 									</object>
@@ -13967,22 +14071,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					</object>
 					<int key="connectionID">5319</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">closeTableSheet:</string>
-						<reference key="source" ref="438574515"/>
-						<reference key="destination" ref="270733112"/>
-					</object>
-					<int key="connectionID">5362</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">closeTableSheet:</string>
-						<reference key="source" ref="438574515"/>
-						<reference key="destination" ref="590415376"/>
-					</object>
-					<int key="connectionID">5363</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
@@ -13991,14 +14079,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					</object>
 					<int key="connectionID">5364</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">tableNameField</string>
-						<reference key="source" ref="438574515"/>
-						<reference key="destination" ref="49938431"/>
-					</object>
-					<int key="connectionID">5365</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">tableEncodingButton</string>
@@ -14767,6 +14847,102 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					</object>
 					<int key="connectionID">5672</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">renameTable:</string>
+						<reference key="source" ref="438574515"/>
+						<reference key="destination" ref="938900701"/>
+					</object>
+					<int key="connectionID">5674</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">tableRenameSheet</string>
+						<reference key="source" ref="438574515"/>
+						<reference key="destination" ref="399092485"/>
+					</object>
+					<int key="connectionID">5685</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">tableRenameText</string>
+						<reference key="source" ref="438574515"/>
+						<reference key="destination" ref="731300775"/>
+					</object>
+					<int key="connectionID">5686</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">closeSheet:</string>
+						<reference key="source" ref="438574515"/>
+						<reference key="destination" ref="270733112"/>
+					</object>
+					<int key="connectionID">5690</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">closeSheet:</string>
+						<reference key="source" ref="438574515"/>
+						<reference key="destination" ref="88145988"/>
+					</object>
+					<int key="connectionID">5691</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">closeSheet:</string>
+						<reference key="source" ref="438574515"/>
+						<reference key="destination" ref="590415376"/>
+					</object>
+					<int key="connectionID">5692</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">closeSheet:</string>
+						<reference key="source" ref="438574515"/>
+						<reference key="destination" ref="994798282"/>
+					</object>
+					<int key="connectionID">5693</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="272856728"/>
+						<reference key="destination" ref="438574515"/>
+					</object>
+					<int key="connectionID">5694</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">renameTableButton</string>
+						<reference key="source" ref="438574515"/>
+						<reference key="destination" ref="994798282"/>
+					</object>
+					<int key="connectionID">5695</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">renameTableMenuItem</string>
+						<reference key="source" ref="438574515"/>
+						<reference key="destination" ref="938900701"/>
+					</object>
+					<int key="connectionID">5696</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">tableRenameField</string>
+						<reference key="source" ref="438574515"/>
+						<reference key="destination" ref="272856728"/>
+					</object>
+					<int key="connectionID">5697</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">tableNameField</string>
+						<reference key="source" ref="438574515"/>
+						<reference key="destination" ref="49938431"/>
+					</object>
+					<int key="connectionID">5698</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -17817,6 +17993,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<reference ref="831803264"/>
 							<reference ref="684779453"/>
 							<reference ref="924446696"/>
+							<reference ref="938900701"/>
 						</object>
 						<reference key="parent" ref="753352469"/>
 					</object>
@@ -20942,6 +21119,89 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						<reference key="object" ref="652323914"/>
 						<reference key="parent" ref="974585893"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5673</int>
+						<reference key="object" ref="938900701"/>
+						<reference key="parent" ref="23713489"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5675</int>
+						<reference key="object" ref="399092485"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="44272488"/>
+						</object>
+						<reference key="parent" ref="1043842561"/>
+						<string key="objectName">renameTableSheet</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5676</int>
+						<reference key="object" ref="44272488"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="88145988"/>
+							<reference ref="272856728"/>
+							<reference ref="731300775"/>
+							<reference ref="994798282"/>
+						</object>
+						<reference key="parent" ref="399092485"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5677</int>
+						<reference key="object" ref="88145988"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="875831639"/>
+						</object>
+						<reference key="parent" ref="44272488"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5678</int>
+						<reference key="object" ref="272856728"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="859957158"/>
+						</object>
+						<reference key="parent" ref="44272488"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5679</int>
+						<reference key="object" ref="731300775"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="487237473"/>
+						</object>
+						<reference key="parent" ref="44272488"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5680</int>
+						<reference key="object" ref="994798282"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="825486974"/>
+						</object>
+						<reference key="parent" ref="44272488"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5681</int>
+						<reference key="object" ref="825486974"/>
+						<reference key="parent" ref="994798282"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5682</int>
+						<reference key="object" ref="487237473"/>
+						<reference key="parent" ref="731300775"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5683</int>
+						<reference key="object" ref="859957158"/>
+						<reference key="parent" ref="272856728"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5684</int>
+						<reference key="object" ref="875831639"/>
+						<reference key="parent" ref="88145988"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -22220,6 +22480,28 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>5660.IBPluginDependency</string>
 					<string>5670.IBPluginDependency</string>
 					<string>5671.IBPluginDependency</string>
+					<string>5673.IBPluginDependency</string>
+					<string>5675.IBEditorWindowLastContentRect</string>
+					<string>5675.IBWindowTemplateEditedContentRect</string>
+					<string>5675.ImportedFromIB2</string>
+					<string>5675.windowTemplate.hasMaxSize</string>
+					<string>5675.windowTemplate.hasMinSize</string>
+					<string>5675.windowTemplate.maxSize</string>
+					<string>5675.windowTemplate.minSize</string>
+					<string>5676.IBPluginDependency</string>
+					<string>5676.ImportedFromIB2</string>
+					<string>5677.IBPluginDependency</string>
+					<string>5677.ImportedFromIB2</string>
+					<string>5678.IBPluginDependency</string>
+					<string>5678.ImportedFromIB2</string>
+					<string>5679.IBPluginDependency</string>
+					<string>5679.ImportedFromIB2</string>
+					<string>5680.IBPluginDependency</string>
+					<string>5680.ImportedFromIB2</string>
+					<string>5681.IBPluginDependency</string>
+					<string>5682.IBPluginDependency</string>
+					<string>5683.IBPluginDependency</string>
+					<string>5684.IBPluginDependency</string>
 					<string>579.IBPluginDependency</string>
 					<string>579.ImportedFromIB2</string>
 					<string>580.IBPluginDependency</string>
@@ -23532,7 +23814,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{323, 258}, {175, 73}}</string>
+					<string>{{72, 240}, {175, 93}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
@@ -23554,8 +23836,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{143, 101}, {944, 550}}</string>
-					<string>{{143, 101}, {944, 550}}</string>
+					<string>{{63, 308}, {944, 550}}</string>
+					<string>{{63, 308}, {944, 550}}</string>
 					<reference ref="9"/>
 					<reference ref="9"/>
 					<string>{{62, 352}, {845, 504}}</string>
@@ -23756,8 +24038,8 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{463, 307}, {269, 112}}</string>
-					<string>{{463, 307}, {269, 112}}</string>
+					<string>{{749, 456}, {269, 112}}</string>
+					<string>{{749, 456}, {269, 112}}</string>
 					<reference ref="9"/>
 					<reference ref="9"/>
 					<reference ref="9"/>
@@ -24025,6 +24307,28 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{612, 378}, {269, 112}}</string>
+					<string>{{612, 378}, {269, 112}}</string>
+					<reference ref="9"/>
+					<reference ref="9"/>
+					<boolean value="YES"/>
+					<string>{269, 112}</string>
+					<string>{269, 112}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
@@ -24286,7 +24590,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">5672</int>
+			<int key="maxID">5698</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -25434,9 +25738,10 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addTable:</string>
 							<string>closeCopyTableSheet:</string>
-							<string>closeTableSheet:</string>
+							<string>closeSheet:</string>
 							<string>copyTable:</string>
 							<string>removeTable:</string>
+							<string>renameTable:</string>
 							<string>updateTables:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
@@ -25447,6 +25752,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -25461,6 +25767,8 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
 							<string>customQueryInstance</string>
 							<string>duplicateTableMenuItem</string>
 							<string>removeTableMenuItem</string>
+							<string>renameTableButton</string>
+							<string>renameTableMenuItem</string>
 							<string>tabView</string>
 							<string>tableContentInstance</string>
 							<string>tableDataInstance</string>
@@ -25468,6 +25776,9 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
 							<string>tableDumpInstance</string>
 							<string>tableEncodingButton</string>
 							<string>tableNameField</string>
+							<string>tableRenameField</string>
+							<string>tableRenameSheet</string>
+							<string>tableRenameText</string>
 							<string>tableSheet</string>
 							<string>tableSourceInstance</string>
 							<string>tableStatusInstance</string>
@@ -25485,6 +25796,11 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
 							<string>NSMenuItem</string>
 							<string>NSMenuItem</string>
 							<string>id</string>
+							<string>NSMenuItem</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
diff --git a/Interfaces/English.lproj/Localizable.strings b/Interfaces/English.lproj/Localizable.strings
index 3a273b00..73af67a7 100644
Binary files a/Interfaces/English.lproj/Localizable.strings and b/Interfaces/English.lproj/Localizable.strings differ
diff --git a/Source/TablesList.h b/Source/TablesList.h
index 9eb632ab..a1268ee7 100644
--- a/Source/TablesList.h
+++ b/Source/TablesList.h
@@ -57,9 +57,14 @@ enum sp_table_types
 	IBOutlet id tableNameField;
 	IBOutlet id tableEncodingButton;
 	IBOutlet id addTableButton;
+	IBOutlet id tableRenameSheet;
+	IBOutlet id tableRenameField;
+	IBOutlet id tableRenameText;
+	IBOutlet id renameTableButton;
 	
 	IBOutlet NSMenuItem *removeTableMenuItem;
 	IBOutlet NSMenuItem *duplicateTableMenuItem;
+	IBOutlet NSMenuItem *renameTableMenuItem;
 
 	CMMCPConnection *mySQLConnection;
 	
@@ -72,9 +77,10 @@ enum sp_table_types
 // IBAction methods
 - (IBAction)updateTables:(id)sender;
 - (IBAction)addTable:(id)sender;
-- (IBAction)closeTableSheet:(id)sender;
+- (IBAction)closeSheet:(id)sender;
 - (IBAction)removeTable:(id)sender;
 - (IBAction)copyTable:(id)sender;
+- (IBAction)renameTable:(id)sender;
 
 // copyTableSheet methods
 - (IBAction)closeCopyTableSheet:(id)sender;
diff --git a/Source/TablesList.m b/Source/TablesList.m
index ce635c9b..18fd1d9c 100644
--- a/Source/TablesList.m
+++ b/Source/TablesList.m
@@ -287,9 +287,9 @@
 }
 
 /**
- * Closes the add table sheet and stops the modal session
+ * Closes the current sheet and stops the modal session
  */
-- (IBAction)closeTableSheet:(id)sender
+- (IBAction)closeSheet:(id)sender
 {
 	[NSApp stopModalWithCode:[sender tag]];
 }
@@ -500,6 +500,52 @@
 	}
 }
 
+/**
+ * Renames the currently selected table.
+ */
+- (IBAction)renameTable:(id)sender
+{
+	if ((![tableSourceInstance saveRowOnDeselect]) || (![tableContentInstance saveRowOnDeselect]) || (![tableDocumentInstance database])) {
+		return;
+	}
+	
+	[tableWindow endEditingFor:nil];
+	
+	[tableRenameText setStringValue:[NSString stringWithFormat:@"Rename table %@ to:", [self tableName]]];
+	
+	[NSApp beginSheet:tableRenameSheet
+	   modalForWindow:tableWindow
+		modalDelegate:self
+	   didEndSelector:nil
+		  contextInfo:nil];
+	
+	NSInteger returnCode = [NSApp runModalForWindow:tableRenameSheet];
+	
+	[NSApp endSheet:tableRenameSheet];
+	[tableRenameSheet orderOut:nil];
+	
+	if (!returnCode) {
+		// Clear table name
+		[tableRenameField setStringValue:@""];
+		
+		return;
+	}
+	
+	[mySQLConnection queryString:[NSString stringWithFormat:@"RENAME TABLE %@ TO %@", [[self tableName] backtickQuotedString], [[tableRenameField stringValue] backtickQuotedString]]];
+	
+	if (![[mySQLConnection getLastErrorMessage] isEqualToString:@""]) {
+		NSBeginAlertSheet(NSLocalizedString(@"Unable to rename table", @"rename table error message"), 
+						  NSLocalizedString(@"OK", @"OK button"), nil, nil, tableWindow, self, nil, nil, nil,
+						  [NSString stringWithFormat:NSLocalizedString(@"The table '%@' was unable to be renamed because an error occurred.\n\nMySQL said: %@", @"rename table error informative message"), [self tableName], [mySQLConnection getLastErrorMessage]]);
+	}
+	else {
+		// If there was no error, rename the table in our list and reload the table view's data
+		[tables replaceObjectAtIndex:[tablesListView selectedRow] withObject:[tableRenameField stringValue]];
+		
+		[tablesListView reloadData];
+	}
+}
+
 #pragma mark Alert sheet methods
 
 /**
@@ -622,9 +668,15 @@
  */
 - (void)controlTextDidChange:(NSNotification *)notification
 {
-	if ([notification object] == tableNameField) {
+	id object = [notification object];
+	
+	if (object == tableNameField) {
 		[addTableButton setEnabled:([[tableNameField stringValue] length] > 0)]; 
 	}
+	
+	if (object == tableRenameField) {
+		[renameTableButton setEnabled:([[tableRenameField stringValue] length] > 0)];
+	}
 }
 
 #pragma mark Getter methods
@@ -1108,17 +1160,25 @@
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem
 {
 	// popup button below table list
-	if ([menuItem action] == @selector(copyTable:))
-	{
-		if( [self tableType] == SP_TABLETYPE_FUNC || [self tableType] == SP_TABLETYPE_PROC )
+	if ([menuItem action] == @selector(copyTable:)) {
+		if ([self tableType] == SP_TABLETYPE_FUNC || [self tableType] == SP_TABLETYPE_PROC)
 			return NO;
-		return [tablesListView numberOfSelectedRows] == 1 && [[self tableName] length] && [tablesListView numberOfSelectedRows] > 0;
+		
+		return ([tablesListView numberOfSelectedRows] == 1) && [[self tableName] length] && [tablesListView numberOfSelectedRows] > 0;
 	}
-	if ([menuItem action] == @selector(removeTable:))
-	{
+	
+	if ([menuItem action] == @selector(removeTable:) ) {
 		return [tablesListView numberOfSelectedRows] > 0;
 	}
 	
+	if ([menuItem action] == @selector(renameTable:)) {
+		if ([self tableType] == SP_TABLETYPE_VIEW) {
+			return NO;
+		}
+		
+		return ([tablesListView numberOfSelectedRows] == 1) && [[self tableName] length];
+	}
+	
 	return [super validateMenuItem:menuItem];
 }		
 
-- 
cgit v1.2.3