Bring outlinew view branch up to date with trunk (r3375:3468).

11 files changed, 97 insertions, 17 deletions

diff --git a/Resources/English.lproj/ConnectionView.strings b/Resources/English.lproj/ConnectionView.strings
index 67d536e3..631ec22f 100644
--- a/Resources/English.lproj/ConnectionView.strings
+++ b/Resources/English.lproj/ConnectionView.strings
diff --git a/Resources/English.lproj/Credits.rtf b/Resources/English.lproj/Credits.rtf
index e344a10c..e1fdccad 100644
--- a/Resources/English.lproj/Credits.rtf
+++ b/Resources/English.lproj/Credits.rtf
@@ -1,11 +1,12 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fmodern\fcharset0 Courier;}
 {\colortbl;\red255\green255\blue255;\red25\green25\blue25;\red0\green27\blue199;}
-\vieww10500\viewh9600\viewkind0
+\vieww11040\viewh8320\viewkind0
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
 
-\f0\b\fs22 \cf2 Current Developers
-\b0 \cf0 \
+\f0\b\fs30 \cf2 Current Developers
+\b0\fs22 \cf0 \
+\
 {\field{\*\fldinst{HYPERLINK "http://www.abhibeckert.com/"}}{\fldrslt Abhi Beckert}}\
 {\field{\*\fldinst{HYPERLINK "http://mattlangtree.com.au/"}}{\fldrslt Matt Langtree}}\
 {\field{\*\fldinst{HYPERLINK "http://www.benperry.com.au/"}}{\fldrslt Ben Perry}}\
@@ -22,16 +23,56 @@ Jim Knight\
 \pard\pardeftab720\qc
 {\field{\*\fldinst{HYPERLINK "http://www.rekowski.info"}}{\fldrslt \cf0 David Rekowski}}\
 \
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
+\pard\pardeftab720\qc
+
+\b\fs30 \cf0 Translations
+\fs22 \
+\
+French\
+\pard\pardeftab720\qc
+
+\b0 \cf0 Micha\'ebl Gallego\
+With Help From\
+Dominique Guardiola\
+Fr\'e9d\'e9ric Latour\
+S\'e9bastien Guy\
+Lou Ferrand
+\b \
+
+\b0 \
+\pard\pardeftab720\qc
 
-\b \cf0 Past Developers
+\b \cf0 German
 \b0 \
+Max Lohrmann\
+With Help From\
+Hans-J\'f6rg Bibiko\
+\
+
+\b Russian\
+\pard\pardeftab720\qc
+
+\b0 \cf0 \uc0\u1040 \u1083 \u1077 \u1082 \u1089 \u1072 \u1085 \u1076 \u1088  \u1042 \u1072 \u1089 \u1080 \u1083 \u1100 \u1077 \u1074   (Alexander Vasiliev) \
+With Help From\
+\uc0\u1071 \u1088 \u1086 \u1089 \u1083 \u1072 \u1074  \u1050 \u1086 \u1085 \u1094 \u1077 \u1074 \u1086 \u1081  (Jaroslav Koncevojj)\
+\uc0\u1052 \u1077 \u1076 \u1103 \u1085 \u1085 \u1080 \u1082  \u1044 \u1084 \u1080 \u1090 \u1088 \u1080 \u1081  \u1042 \u1080 \u1082 \u1090 \u1086 \u1088 \u1086 \u1074 \u1080 \u1095  (Medyannik Dmitry Viktorovich)\
+\
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
+
+\b\fs30 \cf0 Past Developers
+\fs28 \
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
+
+\b0\fs22 \cf0 \
 Lorenz Textor <lorenz@textor.ch>\
 Jeff Skrysak\
 \
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
 
-\b Additional Code
-\b0 \
+\b\fs30 \cf0 Additional Code\
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
+
+\b0\fs22 \cf0 \
 Serge Cohen and\
 Bertrand Mansion\
 (SMySQL framework)\
@@ -120,10 +161,22 @@ Copyright (c) 2006-2010\
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
 \cf0 All rights reserved.\
 \
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
+
+\b \cf0 Sparkle\
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
+
+\b0 \cf0 Copyright \'a9 2006\
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
+{\field{\*\fldinst{HYPERLINK "http://sparkle.andymatuschak.org/"}}{\fldrslt \cf0 Andy Matuschak}}\
+All rights reserved.\
+\
 \pard\pardeftab720\qc
 
-\b \cf0 Artwork
-\b0 \
+\b\fs30 \cf0 Artwork\
+\pard\pardeftab720\qc
+
+\b0\fs22 \cf0 \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
 \cf0 Icon by {\field{\*\fldinst{HYPERLINK "http://nadesign.net/"}}{\fldrslt Na Wong}} and {\field{\*\fldinst{HYPERLINK "http://www.benperry.com.au/"}}{\fldrslt Ben Perry}}\
 GUI design by {\field{\*\fldinst{HYPERLINK "http://www.sequelpro.com/"}}{\fldrslt Sequel Pro}} team.\
diff --git a/Resources/English.lproj/DBView.strings b/Resources/English.lproj/DBView.strings
index fc5a545d..b14e30f0 100644
--- a/Resources/English.lproj/DBView.strings
+++ b/Resources/English.lproj/DBView.strings
diff --git a/Resources/English.lproj/ExportDialog.strings b/Resources/English.lproj/ExportDialog.strings
index 15ad4cda..f807e881 100644
--- a/Resources/English.lproj/ExportDialog.strings
+++ b/Resources/English.lproj/ExportDialog.strings
diff --git a/Resources/English.lproj/InfoPlist.strings b/Resources/English.lproj/InfoPlist.strings
index eb681c32..697fd814 100644
--- a/Resources/English.lproj/InfoPlist.strings
+++ b/Resources/English.lproj/InfoPlist.strings
@@ -1,4 +1,4 @@
 /* Localized versions of Info.plist keys */
 
-CFBundleGetInfoString = "Sequel Pro version 0.9.8, Copyright 2002-2010 Sequel Pro and CocoaMySQL team.";
-NSHumanReadableCopyright = "Copyright 2002-2010 Sequel Pro and CocoaMySQL team.";
\ No newline at end of file
+CFBundleGetInfoString = "Sequel Pro version 0.9.9.1, Copyright 2002-2011 Sequel Pro and CocoaMySQL team.";
+NSHumanReadableCopyright = "Copyright 2002-2011 Sequel Pro and CocoaMySQL team.";
\ No newline at end of file
diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings
index 4f6f9aa8..8b9f8ecd 100644
--- a/Resources/English.lproj/Localizable.strings
+++ b/Resources/English.lproj/Localizable.strings
diff --git a/Resources/English.lproj/Preferences.strings b/Resources/English.lproj/Preferences.strings
index 9798b78d..80ddb95b 100644
--- a/Resources/English.lproj/Preferences.strings
+++ b/Resources/English.lproj/Preferences.strings
diff --git a/Resources/Plists/Info.plist b/Resources/Plists/Info.plist
index 3f900c11..a2fb1aed 100644
--- a/Resources/Plists/Info.plist
+++ b/Resources/Plists/Info.plist
@@ -136,13 +136,15 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.8</string>
+	<string>0.9.9.1</string>
 	<key>CFBundleVersion</key>
 	<string></string>
 	<key>FRFeedbackReporter.maxConsoleLogSize</key>
 	<integer>10000</integer>
 	<key>FRFeedbackReporter.targetURL</key>
 	<string>http://log.sequelpro.com/submit</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.5.0</string>
 	<key>LSMinimumSystemVersionByArchitecture</key>
@@ -157,7 +159,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2002-2010 Sequel Pro and CocoaMySQL team.</string>
+	<string>Copyright 2002-2011 Sequel Pro and CocoaMySQL team.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
@@ -312,5 +314,6 @@
 				<string>sequelpro</string>
 			</array>
 		</dict>
-	</array></dict>
+	</array>
+</dict>
 </plist>
diff --git a/Resources/Plists/PreferenceDefaults.plist b/Resources/Plists/PreferenceDefaults.plist
index 07eb71ae..511e095c 100644
--- a/Resources/Plists/PreferenceDefaults.plist
+++ b/Resources/Plists/PreferenceDefaults.plist
@@ -144,7 +144,7 @@
 	<key>CSVImportFieldEnclosedBy</key>
 	<string>&quot;</string>
 	<key>CSVImportFieldEscapeCharacter</key>
-	<string>\</string>
+	<string>\ or &quot;</string>
 	<key>CSVImportFirstLineIsHeader</key>
 	<true/>
 	<key>SQLExportUseCompression</key>
@@ -183,5 +183,7 @@
 	<false/>
 	<key>CustomQuerySoftIndentWidth</key>
 	<integer>2</integer>
+	<key>LongRunningQueryNotificationTime</key>
+	<real>3</real>
 </dict>
 </plist>
diff --git a/Resources/Plists/QueryKit-Info.plist b/Resources/Plists/QueryKit-Info.plist
new file mode 100644
index 00000000..b76ed0eb
--- /dev/null
+++ b/Resources/Plists/QueryKit-Info.plist
@@ -0,0 +1,22 @@
+<?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>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>QueryKit</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.google.code.sequel-pro.querykit</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/Resources/Plists/Unit Tests-Info.plist b/Resources/Plists/Unit Tests-Info.plist
index 65013556..8e85f172 100644
--- a/Resources/Plists/Unit Tests-Info.plist
+++ b/Resources/Plists/Unit Tests-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.${PRODUCT_NAME:identifier}</string>
+	<string>com.google.code.sequel-pro.tests</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>