Bring Tiger branch up to version 0.9.5:

 - Merge in revisions up to r592 from trunk
 - Rewrite code where appropriate to use Tiger-compaible methods (no easy object enumeriation, no @properties, etc)
 - Remove printing again - problems printing, and template engine is 10.5-only
 - Rework xibs as nibs, and ensure everything looks and works correctly on Tiger; revert interface elements where necessary.
 - Add a method to check whether the app is being run on 10.5+, and show appropriate warning about interface and features
 - Alter strings and change sparkle URL to Tiger-specific appcast

15 files changed, 691 insertions, 841 deletions

diff --git a/Interfaces/English.lproj/Console.nib/classes.nib b/Interfaces/English.lproj/Console.nib/classes.nib
new file mode 100644
index 00000000..0328b33e
--- /dev/null
+++ b/Interfaces/English.lproj/Console.nib/classes.nib
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBClasses</key>
+	<array>
+		<dict>
+			<key>CLASS</key>
+			<string>NSObject</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSWindow</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSResponder</string>
+		</dict>
+		<dict>
+			<key>ACTIONS</key>
+			<dict>
+				<key>clearConsole</key>
+				<string>id</string>
+				<key>copy</key>
+				<string>id</string>
+				<key>saveConsoleAs</key>
+				<string>id</string>
+				<key>toggleShowSelectShowStatements</key>
+				<string>id</string>
+				<key>toggleShowTimeStamps</key>
+				<string>id</string>
+			</dict>
+			<key>CLASS</key>
+			<string>SPQueryConsole</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>OUTLETS</key>
+			<dict>
+				<key>clearConsoleButton</key>
+				<string>NSButton</string>
+				<key>consoleSearchField</key>
+				<string>NSSearchField</string>
+				<key>consoleTableView</key>
+				<string>NSTableView</string>
+				<key>includeTimeStampsButton</key>
+				<string>NSButton</string>
+				<key>progressIndicator</key>
+				<string>NSProgressIndicator</string>
+				<key>saveConsoleButton</key>
+				<string>NSButton</string>
+				<key>saveLogView</key>
+				<string>NSView</string>
+			</dict>
+			<key>SUPERCLASS</key>
+			<string>NSWindowController</string>
+		</dict>
+	</array>
+	<key>IBVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/Interfaces/English.lproj/Console.nib/info.nib b/Interfaces/English.lproj/Console.nib/info.nib
new file mode 100644
index 00000000..2ca73e20
--- /dev/null
+++ b/Interfaces/English.lproj/Console.nib/info.nib
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBFramework Version</key>
+	<string>677</string>
+	<key>IBLastKnownRelativeProjectPath</key>
+	<string>../../sequel-pro.xcodeproj</string>
+	<key>IBOldestOS</key>
+	<integer>5</integer>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>49</integer>
+		<integer>7</integer>
+	</array>
+	<key>IBSystem Version</key>
+	<string>9G55</string>
+	<key>targetFramework</key>
+	<string>IBCocoaFramework</string>
+</dict>
+</plist>
diff --git a/Interfaces/English.lproj/Console.nib/keyedobjects.nib b/Interfaces/English.lproj/Console.nib/keyedobjects.nib
new file mode 100644
index 00000000..5cb43a2e
--- /dev/null
+++ b/Interfaces/English.lproj/Console.nib/keyedobjects.nib
diff --git a/Interfaces/English.lproj/Credits.rtf b/Interfaces/English.lproj/Credits.rtf
index 4ca6fc5d..2f5301ee 100644
--- a/Interfaces/English.lproj/Credits.rtf
+++ b/Interfaces/English.lproj/Credits.rtf
@@ -1,17 +1,22 @@
 {\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf430
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red25\green25\blue25;}
+{\colortbl;\red255\green255\blue255;\red25\green25\blue25;\red0\green27\blue199;}
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
 
 \f0\b\fs22 \cf2 Current Developers
 \b0 \cf0 \
 {\field{\*\fldinst{HYPERLINK "http://www.abhibeckert.com/"}}{\fldrslt Abhi Beckert}}\
-{\field{\*\fldinst{HYPERLINK "http://www.mattlangtree.com/"}}{\fldrslt Matt Langtree}}\
+{\field{\*\fldinst{HYPERLINK "http://mattlangtree.com.au/"}}{\fldrslt Matt Langtree}}\
 {\field{\*\fldinst{HYPERLINK "http://www.benperry.com.au/"}}{\fldrslt Ben Perry}}\
 {\field{\*\fldinst{HYPERLINK "http://www.markltownsend.com"}}{\fldrslt Mark Townsend}}\
 Rowan Beentje \
 \pard\pardeftab720\qc
 {\field{\*\fldinst{HYPERLINK "http://stuconnolly.com/"}}{\fldrslt \cf0 Stuart Connolly}}\
+\pard\pardeftab720\qc
+{\field{\*\fldinst{HYPERLINK "http://marius.me.uk/"}}{\fldrslt \cf0 Marius Ursache}}\
+Jakob Egger\
+\pard\pardeftab720\qc
+{\field{\*\fldinst{HYPERLINK "http://www.google.com/url?q=http://www.bibiko.de/&ei=7XnmSe_aJpCc-gakkKTiBQ&sa=X&oi=spellmeleon_result&resnum=1&ct=result&usg=AFQjCNHkKis7UP61ILUxK7GxnUHortnn_A"}}{\fldrslt \cf3 \ul \ulc3 Hans-J\'f6rg Bibiko}}\
 \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
 
@@ -34,6 +39,7 @@ Jason Hallford\
 Carsten Bl\'fcm\
 Andrea Salomoni\
 Greg Hulands\
+Paul Kim (NoodleLineNumberView)\
 \
 
 \b Artwork
@@ -45,9 +51,11 @@ GUI design by Abhi Beckert, Matt Langtree and snowhouse ({\field{\*\fldinst{HYPE
 \b Additional Thanks
 \b0 \
 City of Cairns.com ({\field{\*\fldinst{HYPERLINK "http://www.cityofcairns.com/"}}{\fldrslt http://cityofcairns.com/}}), for allowing Abhi and Matt to work on Sequel Pro when we'd otherwise be doing billable work.\
-\
+\pard\pardeftab720\ql\qnatural
+\cf0 \
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
 
-\b GPL
+\b \cf0 GPL
 \b0 \
 Copyright (C) 2002-2008 Sequel Pro and CocoaMySQL teams. All rights reserved.\
 \
diff --git a/Interfaces/English.lproj/DBView.nib/classes.nib b/Interfaces/English.lproj/DBView.nib/classes.nib
index 3877cced..d4bac6a8 100644
--- a/Interfaces/English.lproj/DBView.nib/classes.nib
+++ b/Interfaces/English.lproj/DBView.nib/classes.nib
@@ -1,752 +1,444 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBClasses</key>
-	<array>
-		<dict>
-			<key>ACTIONS</key>
-			<dict>
-				<key>copy</key>
-				<string>id</string>
-			</dict>
-			<key>CLASS</key>
-			<string>CMCopyTable</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSTableView</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>ImageAndTextCell</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSTextFieldCell</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>SPTableData</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>tableDocumentInstance</key>
-				<string>id</string>
-				<key>tableListInstance</key>
-				<string>id</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>NSObject</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>KeyChain</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSObject</string>
-		</dict>
-		<dict>
-			<key>ACTIONS</key>
-			<dict>
-				<key>addTable</key>
-				<string>id</string>
-				<key>closeCopyTableSheet</key>
-				<string>id</string>
-				<key>copyTable</key>
-				<string>id</string>
-				<key>removeTable</key>
-				<string>id</string>
-				<key>updateTables</key>
-				<string>id</string>
-			</dict>
-			<key>CLASS</key>
-			<string>TablesList</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>copyTableContentSwitch</key>
-				<string>id</string>
-				<key>copyTableNameField</key>
-				<string>id</string>
-				<key>copyTableSheet</key>
-				<string>id</string>
-				<key>customQueryInstance</key>
-				<string>id</string>
-				<key>tabView</key>
-				<string>id</string>
-				<key>tableContentInstance</key>
-				<string>id</string>
-				<key>tableDataInstance</key>
-				<string>id</string>
-				<key>tableDocumentInstance</key>
-				<string>id</string>
-				<key>tableDumpInstance</key>
-				<string>id</string>
-				<key>tableSourceInstance</key>
-				<string>id</string>
-				<key>tableStatusInstance</key>
-				<string>id</string>
-				<key>tableWindow</key>
-				<string>id</string>
-				<key>tablesListView</key>
-				<string>id</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>NSObject</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>NSImageView</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSControl</string>
-		</dict>
-		<dict>
-			<key>ACTIONS</key>
-			<dict>
-				<key>reloadTable</key>
-				<string>id</string>
-			</dict>
-			<key>CLASS</key>
-			<string>TableStatus</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>commentsBox</key>
-				<string>id</string>
-				<key>rowsAutoIncrement</key>
-				<string>id</string>
-				<key>rowsAvgLength</key>
-				<string>id</string>
-				<key>rowsFormat</key>
-				<string>id</string>
-				<key>rowsNumber</key>
-				<string>id</string>
-				<key>sizeData</key>
-				<string>id</string>
-				<key>sizeFree</key>
-				<string>id</string>
-				<key>sizeIndex</key>
-				<string>id</string>
-				<key>sizeMaxData</key>
-				<string>id</string>
-				<key>tableCreatedAt</key>
-				<string>id</string>
-				<key>tableDataInstance</key>
-				<string>id</string>
-				<key>tableName</key>
-				<string>id</string>
-				<key>tableType</key>
-				<string>id</string>
-				<key>tableUpdatedAt</key>
-				<string>id</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>NSObject</string>
-		</dict>
-		<dict>
-			<key>ACTIONS</key>
-			<dict>
-				<key>addRow</key>
-				<string>id</string>
-				<key>closeEditSheet</key>
-				<string>id</string>
-				<key>copyRow</key>
-				<string>id</string>
-				<key>dropImage</key>
-				<string>id</string>
-				<key>filterTable</key>
-				<string>id</string>
-				<key>openEditSheet</key>
-				<string>id</string>
-				<key>reloadTable</key>
-				<string>id</string>
-				<key>reloadTableValues</key>
-				<string>id</string>
-				<key>removeRow</key>
-				<string>id</string>
-				<key>saveEditSheet</key>
-				<string>id</string>
-				<key>setCompareTypes</key>
-				<string>id</string>
-				<key>showAll</key>
-				<string>id</string>
-				<key>stepLimitRows</key>
-				<string>id</string>
-				<key>toggleFilterField</key>
-				<string>id</string>
-			</dict>
-			<key>CLASS</key>
-			<string>TableContent</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>addButton</key>
-				<string>id</string>
-				<key>argumentField</key>
-				<string>id</string>
-				<key>compareField</key>
-				<string>id</string>
-				<key>copyButton</key>
-				<string>id</string>
-				<key>countText</key>
-				<string>id</string>
-				<key>editData</key>
-				<string>id</string>
-				<key>editImage</key>
-				<string>id</string>
-				<key>editSheet</key>
-				<string>id</string>
-				<key>editSheetTabView</key>
-				<string>id</string>
-				<key>editTextView</key>
-				<string>id</string>
-				<key>fieldField</key>
-				<string>id</string>
-				<key>filterButton</key>
-				<string>id</string>
-				<key>hexTextView</key>
-				<string>id</string>
-				<key>limitRowsButton</key>
-				<string>id</string>
-				<key>limitRowsField</key>
-				<string>id</string>
-				<key>limitRowsStepper</key>
-				<string>id</string>
-				<key>limitRowsText</key>
-				<string>id</string>
-				<key>multipleLineEditingButton</key>
-				<string>id</string>
-				<key>queryConsoleInstance</key>
-				<string>id</string>
-				<key>removeButton</key>
-				<string>id</string>
-				<key>tableContentView</key>
-				<string>CMCopyTable</string>
-				<key>tableDataInstance</key>
-				<string>id</string>
-				<key>tableDocumentInstance</key>
-				<string>id</string>
-				<key>tableWindow</key>
-				<string>id</string>
-				<key>tablesListInstance</key>
-				<string>id</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>NSObject</string>
-		</dict>
-		<dict>
-			<key>ACTIONS</key>
-			<dict>
-				<key>copyCreateTableSyntax</key>
-				<string>id</string>
-			</dict>
-			<key>CLASS</key>
-			<string>FirstResponder</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSObject</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>NSObject</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>CMTextView</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSTextView</string>
-		</dict>
-		<dict>
-			<key>ACTIONS</key>
-			<dict>
-				<key>addQueryFavorite</key>
-				<string>id</string>
-				<key>chooseQueryFavorite</key>
-				<string>id</string>
-				<key>chooseQueryHistory</key>
-				<string>id</string>
-				<key>closeQueryFavoritesSheet</key>
-				<string>id</string>
-				<key>closeSheet</key>
-				<string>id</string>
-				<key>copyQueryFavorite</key>
-				<string>id</string>
-				<key>performQuery</key>
-				<string>id</string>
-				<key>removeQueryFavorite</key>
-				<string>id</string>
-			</dict>
-			<key>CLASS</key>
-			<string>CustomQuery</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>affectedRowsText</key>
-				<string>id</string>
-				<key>copyQueryFavoriteButton</key>
-				<string>id</string>
-				<key>customQueryView</key>
-				<string>CMCopyTable</string>
-				<key>errorText</key>
-				<string>id</string>
-				<key>queryFavoritesButton</key>
-				<string>id</string>
-				<key>queryFavoritesSheet</key>
-				<string>id</string>
-				<key>queryFavoritesView</key>
-				<string>id</string>
-				<key>queryHistoryButton</key>
-				<string>id</string>
-				<key>removeQueryFavoriteButton</key>
-				<string>id</string>
-				<key>tableWindow</key>
-				<string>id</string>
-				<key>textView</key>
-				<string>id</string>
-				<key>valueSheet</key>
-				<string>id</string>
-				<key>valueTextField</key>
-				<string>id</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>NSObject</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>CMImageView</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>delegate</key>
-				<string>id</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>NSImageView</string>
-		</dict>
-		<dict>
-			<key>ACTIONS</key>
-			<dict>
-				<key>cancelProgressBar</key>
-				<string>id</string>
-				<key>changeFormat</key>
-				<string>id</string>
-				<key>changeTable</key>
-				<string>id</string>
-				<key>closeSheet</key>
-				<string>id</string>
-				<key>panelSelectionDidChange</key>
-				<string>id</string>
-				<key>reloadTables</key>
-				<string>id</string>
-				<key>selectTables</key>
-				<string>id</string>
-				<key>stepRow</key>
-				<string>id</string>
-			</dict>
-			<key>CLASS</key>
-			<string>TableDump</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>addCreateTableSwitch</key>
-				<string>id</string>
-				<key>addDropTableSwitch</key>
-				<string>id</string>
-				<key>addErrorsSwitch</key>
-				<string>id</string>
-				<key>addTableContentSwitch</key>
-				<string>id</string>
-				<key>customQueryInstance</key>
-				<string>id</string>
-				<key>errorsSheet</key>
-				<string>id</string>
-				<key>errorsView</key>
-				<string>id</string>
-				<key>exportCSVView</key>
-				<string>id</string>
-				<key>exportDumpTableView</key>
-				<string>id</string>
-				<key>exportDumpView</key>
-				<string>id</string>
-				<key>exportFieldNamesSwitch</key>
-				<string>id</string>
-				<key>exportFieldsEnclosedField</key>
-				<string>id</string>
-				<key>exportFieldsEscapedField</key>
-				<string>id</string>
-				<key>exportFieldsTerminatedField</key>
-				<string>id</string>
-				<key>exportLinesTerminatedField</key>
-				<string>id</string>
-				<key>exportMultipleCSVTableView</key>
-				<string>id</string>
-				<key>exportMultipleCSVView</key>
-				<string>id</string>
-				<key>exportMultipleFieldNamesSwitch</key>
-				<string>id</string>
-				<key>exportMultipleFieldsEnclosedField</key>
-				<string>id</string>
-				<key>exportMultipleFieldsEscapedField</key>
-				<string>id</string>
-				<key>exportMultipleFieldsTerminatedField</key>
-				<string>id</string>
-				<key>exportMultipleLinesTerminatedField</key>
-				<string>id</string>
-				<key>exportMultipleXMLTableView</key>
-				<string>id</string>
-				<key>exportMultipleXMLView</key>
-				<string>id</string>
-				<key>fieldMappingPopup</key>
-				<string>id</string>
-				<key>fieldMappingSheet</key>
-				<string>id</string>
-				<key>fieldMappingTableView</key>
-				<string>id</string>
-				<key>importCSVBox</key>
-				<string>id</string>
-				<key>importCSVView</key>
-				<string>id</string>
-				<key>importFieldNamesSwitch</key>
-				<string>id</string>
-				<key>importFieldsEnclosedField</key>
-				<string>id</string>
-				<key>importFieldsEscapedField</key>
-				<string>id</string>
-				<key>importFieldsTerminatedField</key>
-				<string>id</string>
-				<key>importFormatPopup</key>
-				<string>NSPopUpButton</string>
-				<key>importLinesTerminatedField</key>
-				<string>id</string>
-				<key>recordCountLabel</key>
-				<string>id</string>
-				<key>rowDownButton</key>
-				<string>id</string>
-				<key>rowUpButton</key>
-				<string>id</string>
-				<key>singleProgressBar</key>
-				<string>id</string>
-				<key>singleProgressSheet</key>
-				<string>id</string>
-				<key>singleProgressText</key>
-				<string>id</string>
-				<key>tableContentInstance</key>
-				<string>id</string>
-				<key>tableDataInstance</key>
-				<string>id</string>
-				<key>tableDocumentInstance</key>
-				<string>id</string>
-				<key>tableListView</key>
-				<string>id</string>
-				<key>tableSourceInstance</key>
-				<string>id</string>
-				<key>tableWindow</key>
-				<string>id</string>
-				<key>tablesListInstance</key>
-				<string>id</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>NSObject</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>SPTableInfo</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>infoTable</key>
-				<string>id</string>
-				<key>tableDataInstance</key>
-				<string>id</string>
-				<key>tableDocumentInstance</key>
-				<string>id</string>
-				<key>tableList</key>
-				<string>id</string>
-				<key>tableListInstance</key>
-				<string>id</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>NSObject</string>
-		</dict>
-		<dict>
-			<key>ACTIONS</key>
-			<dict>
-				<key>clearConsole</key>
-				<string>id</string>
-				<key>saveConsoleAs</key>
-				<string>id</string>
-			</dict>
-			<key>CLASS</key>
-			<string>SPQueryConsole</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>consoleTextView</key>
-				<string>NSTextView</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>NSWindowController</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>TableDocumentSplitView</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSSplitView</string>
-		</dict>
-		<dict>
-			<key>ACTIONS</key>
-			<dict>
-				<key>addField</key>
-				<string>id</string>
-				<key>addIndex</key>
-				<string>id</string>
-				<key>chooseIndexType</key>
-				<string>id</string>
-				<key>closeIndexSheet</key>
-				<string>id</string>
-				<key>closeKeySheet</key>
-				<string>id</string>
-				<key>copyField</key>
-				<string>id</string>
-				<key>openIndexSheet</key>
-				<string>id</string>
-				<key>reloadTable</key>
-				<string>id</string>
-				<key>removeField</key>
-				<string>id</string>
-				<key>removeIndex</key>
-				<string>id</string>
-				<key>typeChanged</key>
-				<string>id</string>
-			</dict>
-			<key>CLASS</key>
-			<string>TableSource</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>addFieldButton</key>
-				<string>id</string>
-				<key>addIndexButton</key>
-				<string>id</string>
-				<key>chooseKeyButton</key>
-				<string>id</string>
-				<key>copyFieldButton</key>
-				<string>id</string>
-				<key>indexNameField</key>
-				<string>id</string>
-				<key>indexSheet</key>
-				<string>id</string>
-				<key>indexTypeField</key>
-				<string>id</string>
-				<key>indexView</key>
-				<string>id</string>
-				<key>indexedColumnsField</key>
-				<string>id</string>
-				<key>keySheet</key>
-				<string>id</string>
-				<key>removeFieldButton</key>
-				<string>id</string>
-				<key>removeIndexButton</key>
-				<string>id</string>
-				<key>structureGrabber</key>
-				<string>id</string>
-				<key>tableDataInstance</key>
-				<string>id</string>
-				<key>tableSourceView</key>
-				<string>id</string>
-				<key>tableTypeButton</key>
-				<string>id</string>
-				<key>tableWindow</key>
-				<string>id</string>
-				<key>tablesListInstance</key>
-				<string>id</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>NSObject</string>
-		</dict>
-		<dict>
-			<key>ACTIONS</key>
-			<dict>
-				<key>addDatabase</key>
-				<string>id</string>
-				<key>analyzeTable</key>
-				<string>id</string>
-				<key>cancelConnectSheet</key>
-				<string>id</string>
-				<key>checkTable</key>
-				<string>id</string>
-				<key>checksumTable</key>
-				<string>id</string>
-				<key>chooseDatabase</key>
-				<string>id</string>
-				<key>chooseEncoding</key>
-				<string>id</string>
-				<key>chooseFavorite</key>
-				<string>id</string>
-				<key>closeDatabaseSheet</key>
-				<string>id</string>
-				<key>closeSheet</key>
-				<string>id</string>
-				<key>connect</key>
-				<string>id</string>
-				<key>connectSheetAddToFavorites</key>
-				<string>id</string>
-				<key>connectToDB</key>
-				<string>id</string>
-				<key>copyCreateTableSyntax</key>
-				<string>id</string>
-				<key>export</key>
-				<string>id</string>
-				<key>exportMultipleTables</key>
-				<string>id</string>
-				<key>exportTable</key>
-				<string>id</string>
-				<key>flushPrivileges</key>
-				<string>id</string>
-				<key>flushTable</key>
-				<string>id</string>
-				<key>import</key>
-				<string>id</string>
-				<key>optimizeTable</key>
-				<string>id</string>
-				<key>removeDatabase</key>
-				<string>id</string>
-				<key>removeFavorite</key>
-				<string>id</string>
-				<key>repairTable</key>
-				<string>id</string>
-				<key>setDatabases</key>
-				<string>id</string>
-				<key>showCreateTableSyntax</key>
-				<string>id</string>
-				<key>showVariables</key>
-				<string>id</string>
-				<key>toggleUseSSH</key>
-				<string>id</string>
-				<key>viewContent</key>
-				<string>id</string>
-				<key>viewQuery</key>
-				<string>id</string>
-				<key>viewStatus</key>
-				<string>id</string>
-				<key>viewStructure</key>
-				<string>id</string>
-			</dict>
-			<key>CLASS</key>
-			<string>TableDocument</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>addDatabaseButton</key>
-				<string>id</string>
-				<key>chooseDatabaseButton</key>
-				<string>id</string>
-				<key>connectFavoritesTableView</key>
-				<string>NSTableView</string>
-				<key>connectProgressBar</key>
-				<string>id</string>
-				<key>connectProgressStatusText</key>
-				<string>id</string>
-				<key>connectSheet</key>
-				<string>id</string>
-				<key>createTableSyntaxWindow</key>
-				<string>NSWindow</string>
-				<key>customQueryInstance</key>
-				<string>id</string>
-				<key>databaseEncodingButton</key>
-				<string>id</string>
-				<key>databaseField</key>
-				<string>id</string>
-				<key>databaseNameField</key>
-				<string>id</string>
-				<key>databaseSheet</key>
-				<string>id</string>
-				<key>dbTablesTableView</key>
-				<string>NSTableView</string>
-				<key>favoritesButton</key>
-				<string>id</string>
-				<key>favoritesController</key>
-				<string>NSArrayController</string>
-				<key>hostField</key>
-				<string>id</string>
-				<key>keyChainInstance</key>
-				<string>id</string>
-				<key>passwordField</key>
-				<string>id</string>
-				<key>portField</key>
-				<string>id</string>
-				<key>queryConsoleInstance</key>
-				<string>id</string>
-				<key>queryProgressBar</key>
-				<string>id</string>
-				<key>sidebarGrabber</key>
-				<string>id</string>
-				<key>socketField</key>
-				<string>id</string>
-				<key>sshCheckbox</key>
-				<string>id</string>
-				<key>sshHostField</key>
-				<string>id</string>
-				<key>sshPasswordField</key>
-				<string>id</string>
-				<key>sshPortField</key>
-				<string>id</string>
-				<key>sshUserField</key>
-				<string>id</string>
-				<key>syntaxView</key>
-				<string>id</string>
-				<key>syntaxViewContent</key>
-				<string>id</string>
-				<key>tableContentInstance</key>
-				<string>id</string>
-				<key>tableDataInstance</key>
-				<string>id</string>
-				<key>tableDumpInstance</key>
-				<string>id</string>
-				<key>tableSourceInstance</key>
-				<string>id</string>
-				<key>tableStatusInstance</key>
-				<string>id</string>
-				<key>tableTabView</key>
-				<string>NSTabView</string>
-				<key>tableWindow</key>
-				<string>id</string>
-				<key>tablesListInstance</key>
-				<string>id</string>
-				<key>userField</key>
-				<string>id</string>
-				<key>variablesSheet</key>
-				<string>id</string>
-				<key>variablesTableView</key>
-				<string>id</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>NSDocument</string>
-		</dict>
-	</array>
-	<key>IBVersion</key>
-	<string>1</string>
-</dict>
-</plist>
+{
+    IBClasses = (
+        {
+            ACTIONS = {copy = id; }; 
+            CLASS = CMCopyTable; 
+            LANGUAGE = ObjC; 
+            SUPERCLASS = NSTableView; 
+        }, 
+        {
+            CLASS = CMImageView; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {delegate = id; }; 
+            SUPERCLASS = NSImageView; 
+        }, 
+        {
+            CLASS = CMTextView; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {scrollView = NSScrollView; }; 
+            SUPERCLASS = NSTextView; 
+        }, 
+        {
+            ACTIONS = {
+                addQueryFavorite = id; 
+                chooseQueryFavorite = id; 
+                chooseQueryHistory = id; 
+                closeQueryFavoritesSheet = id; 
+                closeSheet = id; 
+                copyQueryFavorite = id; 
+                gearMenuItemSelected = id; 
+                removeQueryFavorite = id; 
+                runAllQueries = id; 
+                runSelectedQueries = id; 
+            }; 
+            CLASS = CustomQuery; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                affectedRowsText = id; 
+                autoindentMenuItem = NSMenuItem; 
+                autopairMenuItem = NSMenuItem; 
+                autouppercaseKeywordsMenuItem = NSMenuItem; 
+                clearHistoryMenuItem = NSMenuItem; 
+                completionListMenuItem = NSMenuItem; 
+                copyQueryFavoriteButton = id; 
+                customQueryView = CMCopyTable; 
+                editorFontMenuItem = NSMenuItem; 
+                errorText = id; 
+                queryFavoritesButton = id; 
+                queryFavoritesSheet = id; 
+                queryFavoritesView = id; 
+                queryHistoryButton = id; 
+                removeQueryFavoriteButton = id; 
+                runAllButton = id; 
+                runSelectionButton = id; 
+                runSelectionMenuItem = NSMenuItem; 
+                shiftLeftMenuItem = NSMenuItem; 
+                shiftRightMenuItem = NSMenuItem; 
+                tableWindow = id; 
+                textView = CMTextView; 
+                valueSheet = id; 
+                valueTextField = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {
+            ACTIONS = {copyCreateTableSyntax = id; }; 
+            CLASS = FirstResponder; 
+            LANGUAGE = ObjC; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {CLASS = ImageAndTextCell; LANGUAGE = ObjC; SUPERCLASS = NSTextFieldCell; }, 
+        {CLASS = KeyChain; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
+        {CLASS = NSImageView; LANGUAGE = ObjC; SUPERCLASS = NSControl; }, 
+        {CLASS = NSObject; LANGUAGE = ObjC; }, 
+        {
+            ACTIONS = {
+                doDecomposedStringWithCanonicalMapping = id; 
+                doDecomposedStringWithCompatibilityMapping = id; 
+                doPrecomposedStringWithCanonicalMapping = id; 
+                doPrecomposedStringWithCompatibilityMapping = id; 
+                doRemoveDiacritics = id; 
+                doSelectionLowerCase = id; 
+                doSelectionTitleCase = id; 
+                doSelectionUpperCase = id; 
+                doTranspose = id; 
+                selectCurrentLine = id; 
+                selectCurrentWord = id; 
+            }; 
+            CLASS = NSTextView; 
+            LANGUAGE = ObjC; 
+            SUPERCLASS = NSText; 
+        }, 
+        {CLASS = NSWindow; LANGUAGE = ObjC; SUPERCLASS = NSResponder; }, 
+        {
+            ACTIONS = {closeSheet = id; switchInput = id; switchTab = id; }; 
+            CLASS = SPExportController; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                exampleNameLabel = id; 
+                exportCSVFieldsEscapedField = id; 
+                exportCSVFieldsTerminatedField = id; 
+                exportCSVFieldsWrappedField = id; 
+                exportCSVIncludeFieldNamesCheck = id; 
+                exportCSVLinesTerminatedField = id; 
+                exportExcelSheetOrFilePerTableMatrix = id; 
+                exportFilePerTableCheck = id; 
+                exportFilePerTableNote = id; 
+                exportHTMLIncludeHeadAndBodyTagsCheck = id; 
+                exportHTMLIncludeStructureCheck = id; 
+                exportInputMatrix = id; 
+                exportPDFIncludeStructureCheck = id; 
+                exportSQLIncludeDropSyntaxCheck = id; 
+                exportSQLIncludeErrorsCheck = id; 
+                exportSQLIncludeStructureCheck = id; 
+                exportTabBar = id; 
+                exportTableList = id; 
+                exportToolbar = id; 
+                exportWindow = id; 
+                exportXMLIncludeStructureCheck = id; 
+                tableDocumentInstance = id; 
+                tableWindow = id; 
+                tablesListInstance = id; 
+                tokenNameField = id; 
+                tokenNameTokensField = id; 
+                tokenNameView = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {
+            CLASS = SPTableData; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {tableDocumentInstance = id; tableListInstance = id; }; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {
+            CLASS = SPTableInfo; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                infoTable = id; 
+                tableDataInstance = id; 
+                tableDocumentInstance = id; 
+                tableList = id; 
+                tableListInstance = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {
+            ACTIONS = {
+                addRow = id; 
+                closeEditSheet = id; 
+                copyRow = id; 
+                dropImage = id; 
+                filterTable = id; 
+                openEditSheet = id; 
+                reloadTable = id; 
+                reloadTableValues = id; 
+                removeRow = id; 
+                saveEditSheet = id; 
+                setCompareTypes = id; 
+                showAll = id; 
+                stepLimitRows = id; 
+                toggleFilterField = id; 
+            }; 
+            CLASS = TableContent; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                addButton = id; 
+                argumentField = id; 
+                compareField = id; 
+                copyButton = id; 
+                countText = id; 
+                editData = id; 
+                editImage = id; 
+                editSheet = id; 
+                editSheetTabView = id; 
+                editTextView = id; 
+                fieldField = id; 
+                filterButton = id; 
+                hexTextView = id; 
+                limitRowsButton = id; 
+                limitRowsField = id; 
+                limitRowsStepper = id; 
+                limitRowsText = id; 
+                multipleLineEditingButton = id; 
+                removeButton = id; 
+                tableContentView = CMCopyTable; 
+                tableDataInstance = id; 
+                tableDocumentInstance = id; 
+                tableWindow = id; 
+                tablesListInstance = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {
+            ACTIONS = {
+                addConnectionToFavorites = id; 
+                addDatabase = id; 
+                analyzeTable = id; 
+                cancelConnectSheet = id; 
+                checkTable = id; 
+                checksumTable = id; 
+                chooseDatabase = id; 
+                chooseEncoding = id; 
+                chooseFavorite = id; 
+                closeDatabaseSheet = id; 
+                closeSheet = id; 
+                connect = id; 
+                connectSheetAddToFavorites = id; 
+                connectToDB = id; 
+                copyCreateTableSyntax = id; 
+                editFavorites = id; 
+                export = id; 
+                exportMultipleTables = id; 
+                exportTable = id; 
+                flushPrivileges = id; 
+                flushTable = id; 
+                import = id; 
+                optimizeTable = id; 
+                removeDatabase = id; 
+                repairTable = id; 
+                setDatabases = id; 
+                showCreateTableSyntax = id; 
+                showVariables = id; 
+                toggleUseSSH = id; 
+                viewContent = id; 
+                viewQuery = id; 
+                viewStatus = id; 
+                viewStructure = id; 
+            }; 
+            CLASS = TableDocument; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                addDatabaseButton = id; 
+                chooseDatabaseButton = id; 
+                connectFavoritesTableView = NSTableView; 
+                connectProgressBar = id; 
+                connectProgressStatusText = NSTextField; 
+                connectSheet = id; 
+                createTableSyntaxWindow = NSWindow; 
+                customQueryInstance = id; 
+                customQueryTextView = NSTextView; 
+                databaseEncodingButton = id; 
+                databaseField = id; 
+                databaseNameField = id; 
+                databaseSheet = id; 
+                dbTablesTableView = NSTableView; 
+                favoritesButton = id; 
+                favoritesController = NSArrayController; 
+                hostField = id; 
+                keyChainInstance = id; 
+                nameField = id; 
+                passwordField = id; 
+                portField = id; 
+                queryProgressBar = id; 
+                sidebarGrabber = id; 
+                socketField = id; 
+                spExportControllerInstance = id; 
+                sshCheckbox = id; 
+                sshHostField = id; 
+                sshPasswordField = id; 
+                sshPortField = id; 
+                sshUserField = id; 
+                syntaxView = id; 
+                syntaxViewContent = id; 
+                tableContentInstance = id; 
+                tableDataInstance = id; 
+                tableDumpInstance = id; 
+                tableSourceInstance = id; 
+                tableStatusInstance = id; 
+                tableTabView = NSTabView; 
+                tableWindow = id; 
+                tablesListInstance = id; 
+                userField = id; 
+                variablesSheet = id; 
+                variablesTableView = id; 
+            }; 
+            SUPERCLASS = NSDocument; 
+        }, 
+        {CLASS = TableDocumentSplitView; LANGUAGE = ObjC; SUPERCLASS = NSSplitView; }, 
+        {
+            ACTIONS = {
+                cancelProgressBar = id; 
+                changeFormat = id; 
+                changeTable = id; 
+                closeSheet = id; 
+                panelSelectionDidChange = id; 
+                reloadTables = id; 
+                selectTables = id; 
+                stepRow = id; 
+                switchInput = id; 
+                switchTab = id; 
+            }; 
+            CLASS = TableDump; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                addCreateTableSwitch = id; 
+                addDropTableSwitch = id; 
+                addErrorsSwitch = id; 
+                addTableContentSwitch = id; 
+                customQueryInstance = id; 
+                errorsSheet = id; 
+                errorsView = id; 
+                exportCSVView = id; 
+                exportDumpTableView = id; 
+                exportDumpView = id; 
+                exportFieldNamesSwitch = id; 
+                exportFieldsEnclosedField = id; 
+                exportFieldsEscapedField = id; 
+                exportFieldsTerminatedField = id; 
+                exportLinesTerminatedField = id; 
+                exportMultipleCSVTableView = id; 
+                exportMultipleCSVView = id; 
+                exportMultipleFieldNamesSwitch = id; 
+                exportMultipleFieldsEnclosedField = id; 
+                exportMultipleFieldsEscapedField = id; 
+                exportMultipleFieldsTerminatedField = id; 
+                exportMultipleLinesTerminatedField = id; 
+                exportMultipleXMLTableView = id; 
+                exportMultipleXMLView = id; 
+                exportTabBar = id; 
+                exportTableList = id; 
+                exportToolbar = id; 
+                exportWindow = id; 
+                fieldMappingPopup = id; 
+                fieldMappingSheet = id; 
+                fieldMappingTableView = id; 
+                importCSVBox = id; 
+                importCSVView = id; 
+                importFieldNamesSwitch = id; 
+                importFieldsEnclosedField = id; 
+                importFieldsEscapedField = id; 
+                importFieldsTerminatedField = id; 
+                importFormatPopup = NSPopUpButton; 
+                importLinesTerminatedField = id; 
+                recordCountLabel = id; 
+                rowDownButton = id; 
+                rowUpButton = id; 
+                singleProgressBar = id; 
+                singleProgressSheet = id; 
+                singleProgressText = id; 
+                tableContentInstance = id; 
+                tableDataInstance = id; 
+                tableDocumentInstance = id; 
+                tableListView = id; 
+                tableSourceInstance = id; 
+                tableWindow = id; 
+                tablesListInstance = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {
+            ACTIONS = {
+                addField = id; 
+                addIndex = id; 
+                chooseIndexType = id; 
+                closeIndexSheet = id; 
+                closeKeySheet = id; 
+                copyField = id; 
+                openIndexSheet = id; 
+                reloadTable = id; 
+                removeField = id; 
+                removeIndex = id; 
+                typeChanged = id; 
+            }; 
+            CLASS = TableSource; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                addFieldButton = id; 
+                addIndexButton = id; 
+                chooseKeyButton = id; 
+                copyFieldButton = id; 
+                indexNameField = id; 
+                indexSheet = id; 
+                indexTypeField = id; 
+                indexView = id; 
+                indexedColumnsField = id; 
+                keySheet = id; 
+                removeFieldButton = id; 
+                removeIndexButton = id; 
+                structureGrabber = id; 
+                tableDataInstance = id; 
+                tableSourceView = id; 
+                tableTypeButton = id; 
+                tableWindow = id; 
+                tablesListInstance = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {
+            ACTIONS = {reloadTable = id; }; 
+            CLASS = TableStatus; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                commentsBox = id; 
+                rowsAutoIncrement = id; 
+                rowsAvgLength = id; 
+                rowsFormat = id; 
+                rowsNumber = id; 
+                sizeData = id; 
+                sizeFree = id; 
+                sizeIndex = id; 
+                sizeMaxData = id; 
+                tableCreatedAt = id; 
+                tableDataInstance = id; 
+                tableName = id; 
+                tableType = id; 
+                tableUpdatedAt = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {
+            ACTIONS = {
+                addTable = id; 
+                closeCopyTableSheet = id; 
+                closeTableSheet = id; 
+                copyTable = id; 
+                removeTable = id; 
+                updateTables = id; 
+            }; 
+            CLASS = TablesList; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                addTableButton = id; 
+                copyTableContentSwitch = id; 
+                copyTableNameField = id; 
+                copyTableSheet = id; 
+                customQueryInstance = id; 
+                tabView = id; 
+                tableContentInstance = id; 
+                tableDataInstance = id; 
+                tableDocumentInstance = id; 
+                tableDumpInstance = id; 
+                tableEncodingButton = id; 
+                tableNameField = id; 
+                tableSheet = id; 
+                tableSourceInstance = id; 
+                tableStatusInstance = id; 
+                tableWindow = id; 
+                tablesListView = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }
+    ); 
+    IBVersion = 1; 
+}
\ No newline at end of file
diff --git a/Interfaces/English.lproj/DBView.nib/info.nib b/Interfaces/English.lproj/DBView.nib/info.nib
index 763696d5..1995ac1f 100644
--- a/Interfaces/English.lproj/DBView.nib/info.nib
+++ b/Interfaces/English.lproj/DBView.nib/info.nib
@@ -1,17 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>IBDocumentLocation</key>
+	<string>69 85 356 240 0 0 1024 746 </string>
+	<key>IBEditorPositions</key>
+	<dict>
+		<key>1058</key>
+		<string>263 422 498 199 0 0 1024 746 </string>
+		<key>1113</key>
+		<string>361 422 301 199 0 0 1024 746 </string>
+		<key>3994</key>
+		<string>402 485 220 74 0 0 1024 746 </string>
+		<key>4529</key>
+		<string>293 433 437 177 0 0 1024 746 </string>
+		<key>815</key>
+		<string>290 443 444 158 0 0 1024 746 </string>
+		<key>910</key>
+		<string>273 426 477 191 0 0 1024 746 </string>
+	</dict>
 	<key>IBFramework Version</key>
-	<string>677</string>
+	<string>489.0</string>
 	<key>IBLastKnownRelativeProjectPath</key>
 	<string>../../sequel-pro.xcodeproj</string>
+	<key>IBLockedTabItems</key>
+	<array>
+		<integer>28</integer>
+	</array>
 	<key>IBOldestOS</key>
 	<integer>5</integer>
-	<key>IBOpenObjects</key>
-	<array/>
 	<key>IBSystem Version</key>
-	<string>9G55</string>
+	<string>8S165</string>
 	<key>targetFramework</key>
 	<string>IBCocoaFramework</string>
 </dict>
diff --git a/Interfaces/English.lproj/DBView.nib/keyedobjects.nib b/Interfaces/English.lproj/DBView.nib/keyedobjects.nib
index 3ee4c7ad..c44f2194 100644
--- a/Interfaces/English.lproj/DBView.nib/keyedobjects.nib
+++ b/Interfaces/English.lproj/DBView.nib/keyedobjects.nib
diff --git a/Interfaces/English.lproj/InfoPlist.strings b/Interfaces/English.lproj/InfoPlist.strings
index a213db55..6048d98c 100644
--- a/Interfaces/English.lproj/InfoPlist.strings
+++ b/Interfaces/English.lproj/InfoPlist.strings
@@ -1,4 +1,4 @@
 /* Localized versions of Info.plist keys */
 
-CFBundleGetInfoString = "Sequel Pro version 0.9.4, Copyright 2002-2009 Sequel Pro and CocoaMySQL team.";
+CFBundleGetInfoString = "Sequel Pro version 0.9.5 Tiger Version, Copyright 2002-2009 Sequel Pro and CocoaMySQL team.";
 NSHumanReadableCopyright = "Copyright 2002-2009 Sequel Pro and CocoaMySQL team.";
\ No newline at end of file
diff --git a/Interfaces/English.lproj/Localizable.strings b/Interfaces/English.lproj/Localizable.strings
index 7bc7a52d..bba6709a 100644
--- a/Interfaces/English.lproj/Localizable.strings
+++ b/Interfaces/English.lproj/Localizable.strings
diff --git a/Interfaces/English.lproj/MainMenu.nib/classes.nib b/Interfaces/English.lproj/MainMenu.nib/classes.nib
index e80e7306..cfb78d7c 100644
--- a/Interfaces/English.lproj/MainMenu.nib/classes.nib
+++ b/Interfaces/English.lproj/MainMenu.nib/classes.nib
@@ -39,65 +39,54 @@
             LANGUAGE = ObjC; 
             SUPERCLASS = NSObject; 
         }, 
-        {CLASS = KeyChain; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
         {
-            ACTIONS = {
-                addFavorite = id; 
-                checkForUpdates = id; 
-                chooseLimitRows = id; 
-                closeFavoriteSheet = id; 
-                closePreferences = id; 
-                copyFavorite = id; 
-                donate = id; 
-                openPreferences = id; 
-                removeFavorite = id; 
-                toggleUseSSH = id; 
-                visitHelpWebsite = id; 
-                visitWebsite = id; 
-            }; 
+            ACTIONS = {donate = id; openPreferences = id; visitHelpWebsite = id; visitWebsite = id; }; 
             CLASS = MainController; 
             LANGUAGE = ObjC; 
-            OUTLETS = {
-                databaseField = id; 
-                dontShowBlobSwitch = id; 
-                encodingPopUpButton = id; 
-                favoriteSheet = id; 
-                fetchRowCountSwitch = id; 
-                hostField = id; 
-                keyChainInstance = id; 
-                limitRowsField = id; 
-                limitRowsSwitch = id; 
-                nameField = id; 
-                nullValueField = id; 
-                passwordField = id; 
-                portField = id; 
-                preferencesWindow = id; 
-                reloadAfterAddingSwitch = id; 
-                reloadAfterEditingSwitch = id; 
-                reloadAfterRemovingSwitch = id; 
-                showErrorSwitch = id; 
-                socketField = id; 
-                sshCheckbox = id; 
-                sshHostField = id; 
-                sshPasswordField = id; 
-                sshPortField = id; 
-                sshUserField = id; 
-                tableView = id; 
-                useMonospacedFontsSwitch = id; 
-                userField = id; 
-            }; 
             SUPERCLASS = NSObject; 
         }, 
         {CLASS = NSMenu; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
         {CLASS = NSObject; LANGUAGE = ObjC; }, 
         {
-            ACTIONS = {clearConsole = id; saveConsoleAs = id; }; 
+            ACTIONS = {
+                doDecomposedStringWithCanonicalMapping = id; 
+                doDecomposedStringWithCompatibilityMapping = id; 
+                doPrecomposedStringWithCanonicalMapping = id; 
+                doPrecomposedStringWithCompatibilityMapping = id; 
+                doRemoveDiacritics = id; 
+                doSelectionLowerCase = id; 
+                doSelectionTitleCase = id; 
+                doSelectionUpperCase = id; 
+                doTranspose = id; 
+                selectCurrentLine = id; 
+                selectCurrentWord = id; 
+            }; 
+            CLASS = NSTextView; 
+            LANGUAGE = ObjC; 
+            SUPERCLASS = NSText; 
+        }, 
+        {CLASS = NSWindow; LANGUAGE = ObjC; SUPERCLASS = NSResponder; }, 
+        {
+            ACTIONS = {
+                clearConsole = id; 
+                copy = id; 
+                saveConsoleAs = id; 
+                toggleShowSelectShowStatements = id; 
+                toggleShowTimeStamps = id; 
+            }; 
             CLASS = SPQueryConsole; 
             LANGUAGE = ObjC; 
-            OUTLETS = {consoleView = SPQueryConsoleView; }; 
+            OUTLETS = {
+                clearConsoleButton = NSButton; 
+                consoleSearchField = NSSearchField; 
+                consoleTableView = NSTableView; 
+                includeTimeStampsButton = NSButton; 
+                progressIndicator = NSProgressIndicator; 
+                saveConsoleButton = NSButton; 
+                saveLogView = NSView; 
+            }; 
             SUPERCLASS = NSWindowController; 
         }, 
-        {CLASS = SPQueryConsoleView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, 
         {
             ACTIONS = {checkForUpdates = id; }; 
             CLASS = SUUpdater; 
@@ -107,6 +96,7 @@
         }, 
         {
             ACTIONS = {
+                addConnectionToFavorites = id; 
                 addDatabase = id; 
                 analyzeTable = id; 
                 cancelConnectSheet = id; 
@@ -121,6 +111,7 @@
                 connectSheetAddToFavorites = id; 
                 connectToDB = id; 
                 copyCreateTableSyntax = id; 
+                editFavorites = id; 
                 export = id; 
                 exportMultipleTables = id; 
                 exportTable = id; 
@@ -129,7 +120,6 @@
                 import = id; 
                 optimizeTable = id; 
                 removeDatabase = id; 
-                removeFavorite = id; 
                 repairTable = id; 
                 setDatabases = id; 
                 showCreateTableSyntax = id; 
@@ -150,6 +140,7 @@
                 connectSheet = id; 
                 createTableSyntaxWindow = NSWindow; 
                 customQueryInstance = id; 
+                customQueryTextView = NSTextView; 
                 databaseEncodingButton = id; 
                 databaseField = id; 
                 databaseNameField = id; 
@@ -159,12 +150,13 @@
                 favoritesController = NSArrayController; 
                 hostField = id; 
                 keyChainInstance = id; 
+                nameField = id; 
                 passwordField = id; 
                 portField = id; 
-                queryConsoleInstance = id; 
                 queryProgressBar = id; 
                 sidebarGrabber = id; 
                 socketField = id; 
+                spExportControllerInstance = id; 
                 syntaxView = id; 
                 syntaxViewContent = id; 
                 tableContentInstance = id; 
@@ -180,33 +172,6 @@
                 variablesTableView = id; 
             }; 
             SUPERCLASS = NSDocument; 
-        }, 
-        {
-            ACTIONS = {
-                addTable = id; 
-                closeCopyTableSheet = id; 
-                copyTable = id; 
-                removeTable = id; 
-                updateTables = id; 
-            }; 
-            CLASS = TablesList; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                copyTableContentSwitch = id; 
-                copyTableNameField = id; 
-                copyTableSheet = id; 
-                customQueryInstance = id; 
-                tabView = id; 
-                tableContentInstance = id; 
-                tableDataInstance = id; 
-                tableDocumentInstance = id; 
-                tableDumpInstance = id; 
-                tableSourceInstance = id; 
-                tableStatusInstance = id; 
-                tableWindow = id; 
-                tablesListView = id; 
-            }; 
-            SUPERCLASS = NSObject; 
         }
     ); 
     IBVersion = 1; 
diff --git a/Interfaces/English.lproj/MainMenu.nib/info.nib b/Interfaces/English.lproj/MainMenu.nib/info.nib
index 810872d5..0ce25e8a 100644
--- a/Interfaces/English.lproj/MainMenu.nib/info.nib
+++ b/Interfaces/English.lproj/MainMenu.nib/info.nib
@@ -3,18 +3,18 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>69 85 356 240 0 0 1024 746 </string>
+	<string>116 228 356 240 0 0 1024 746 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>29</key>
-		<string>69 330 481 44 0 0 1024 746 </string>
+		<string>116 473 481 44 0 0 1024 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>489.0</string>
 	<key>IBLastKnownRelativeProjectPath</key>
 	<string>../../sequel-pro.xcodeproj</string>
 	<key>IBOldestOS</key>
-	<integer>4</integer>
+	<integer>5</integer>
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>29</integer>
diff --git a/Interfaces/English.lproj/MainMenu.nib/keyedobjects.nib b/Interfaces/English.lproj/MainMenu.nib/keyedobjects.nib
index a7c4e7bb..c11c2e69 100644
--- a/Interfaces/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/Interfaces/English.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/Interfaces/English.lproj/Preferences.nib/classes.nib b/Interfaces/English.lproj/Preferences.nib/classes.nib
new file mode 100644
index 00000000..1ae0ade6
--- /dev/null
+++ b/Interfaces/English.lproj/Preferences.nib/classes.nib
@@ -0,0 +1,49 @@
+{
+    IBClasses = (
+        {CLASS = NSObject; LANGUAGE = ObjC; }, 
+        {CLASS = NSWindow; LANGUAGE = ObjC; SUPERCLASS = NSResponder; }, 
+        {
+            ACTIONS = {
+                addFavorite = id; 
+                displayAutoUpdatePreferences = id; 
+                displayFavoritePreferences = id; 
+                displayGeneralPreferences = id; 
+                displayNetworkPreferences = id; 
+                displayNotificationPreferences = id; 
+                displayTablePreferences = id; 
+                duplicateFavorite = id; 
+                removeFavorite = id; 
+                saveFavorite = id; 
+                updateDefaultFavorite = id; 
+            }; 
+            CLASS = SPPreferenceController; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                autoUpdateView = NSView; 
+                databaseField = NSTextField; 
+                defaultFavoritePopup = NSPopUpButton; 
+                favoritesController = NSArrayController; 
+                favoritesTableView = NSTableView; 
+                favoritesView = NSView; 
+                generalView = NSView; 
+                hostField = NSTextField; 
+                nameField = NSTextField; 
+                networkView = NSView; 
+                notificationsView = NSView; 
+                passwordField = NSSecureTextField; 
+                preferencesWindow = NSWindow; 
+                tablesView = NSView; 
+                userField = NSTextField; 
+            }; 
+            SUPERCLASS = NSWindowController; 
+        }, 
+        {
+            ACTIONS = {checkForUpdates = id; }; 
+            CLASS = SUUpdater; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {delegate = id; }; 
+            SUPERCLASS = NSObject; 
+        }
+    ); 
+    IBVersion = 1; 
+}
\ No newline at end of file
diff --git a/Interfaces/English.lproj/Preferences.nib/info.nib b/Interfaces/English.lproj/Preferences.nib/info.nib
new file mode 100644
index 00000000..2538cf8e
--- /dev/null
+++ b/Interfaces/English.lproj/Preferences.nib/info.nib
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBDocumentLocation</key>
+	<string>69 85 356 240 0 0 1024 746 </string>
+	<key>IBEditorPositions</key>
+	<dict>
+		<key>17</key>
+		<string>252 392 520 260 0 0 1024 746 </string>
+		<key>400</key>
+		<string>252 310 520 423 0 0 1024 746 </string>
+		<key>512</key>
+		<string>252 379 520 286 0 0 1024 746 </string>
+		<key>56</key>
+		<string>252 454 520 135 0 0 1024 746 </string>
+		<key>60</key>
+		<string>252 440 520 164 0 0 1024 746 </string>
+		<key>641</key>
+		<string>252 454 520 135 0 0 1024 746 </string>
+	</dict>
+	<key>IBFramework Version</key>
+	<string>489.0</string>
+	<key>IBLastKnownRelativeProjectPath</key>
+	<string>../../sequel-pro.xcodeproj</string>
+	<key>IBOldestOS</key>
+	<integer>5</integer>
+	<key>IBSystem Version</key>
+	<string>8S165</string>
+	<key>targetFramework</key>
+	<string>IBCocoaFramework</string>
+</dict>
+</plist>
diff --git a/Interfaces/English.lproj/Preferences.nib/keyedobjects.nib b/Interfaces/English.lproj/Preferences.nib/keyedobjects.nib
new file mode 100644
index 00000000..226e3341
--- /dev/null
+++ b/Interfaces/English.lproj/Preferences.nib/keyedobjects.nib