Merge remote-tracking branch 'sequelpro/master'

23 files changed, 1 insertions, 1 deletions

diff --git a/Resources/English.lproj/AboutPanel.strings b/Resources/English.lproj/AboutPanel.strings
index f054ebc4..12b859b3 100644
--- a/Resources/English.lproj/AboutPanel.strings
+++ b/Resources/English.lproj/AboutPanel.strings
diff --git a/Resources/English.lproj/BundleEditor.strings b/Resources/English.lproj/BundleEditor.strings
index 536cdd5a..aa3d5c59 100644
--- a/Resources/English.lproj/BundleEditor.strings
+++ b/Resources/English.lproj/BundleEditor.strings
diff --git a/Resources/English.lproj/ConnectionView.strings b/Resources/English.lproj/ConnectionView.strings
index 995eae7f..e72e0442 100644
--- a/Resources/English.lproj/ConnectionView.strings
+++ b/Resources/English.lproj/ConnectionView.strings
diff --git a/Resources/English.lproj/Console.strings b/Resources/English.lproj/Console.strings
index 1320d37e..60c16b3e 100644
--- a/Resources/English.lproj/Console.strings
+++ b/Resources/English.lproj/Console.strings
diff --git a/Resources/English.lproj/ContentFilterManager.strings b/Resources/English.lproj/ContentFilterManager.strings
index 009b4d6e..68922c24 100644
--- a/Resources/English.lproj/ContentFilterManager.strings
+++ b/Resources/English.lproj/ContentFilterManager.strings
diff --git a/Resources/English.lproj/ContentPaginationView.strings b/Resources/English.lproj/ContentPaginationView.strings
index 5dedf99c..482afec1 100644
--- a/Resources/English.lproj/ContentPaginationView.strings
+++ b/Resources/English.lproj/ContentPaginationView.strings
diff --git a/Resources/English.lproj/DBView.strings b/Resources/English.lproj/DBView.strings
index a76c5722..3d5ad7b9 100644
--- a/Resources/English.lproj/DBView.strings
+++ b/Resources/English.lproj/DBView.strings
diff --git a/Resources/English.lproj/DataMigrationDialog.strings b/Resources/English.lproj/DataMigrationDialog.strings
index 5203c25c..9587a6ef 100644
--- a/Resources/English.lproj/DataMigrationDialog.strings
+++ b/Resources/English.lproj/DataMigrationDialog.strings
diff --git a/Resources/English.lproj/DatabaseProcessList.strings b/Resources/English.lproj/DatabaseProcessList.strings
index f76abf72..679e4faf 100644
--- a/Resources/English.lproj/DatabaseProcessList.strings
+++ b/Resources/English.lproj/DatabaseProcessList.strings
diff --git a/Resources/English.lproj/ExportDialog.strings b/Resources/English.lproj/ExportDialog.strings
index 0af13a86..773a7f35 100644
--- a/Resources/English.lproj/ExportDialog.strings
+++ b/Resources/English.lproj/ExportDialog.strings
diff --git a/Resources/English.lproj/FieldEditorSheet.strings b/Resources/English.lproj/FieldEditorSheet.strings
index 7c326a49..816cb986 100644
--- a/Resources/English.lproj/FieldEditorSheet.strings
+++ b/Resources/English.lproj/FieldEditorSheet.strings
diff --git a/Resources/English.lproj/GotoDatabaseDialog.strings b/Resources/English.lproj/GotoDatabaseDialog.strings
new file mode 100644
index 00000000..bf48b104
--- /dev/null
+++ b/Resources/English.lproj/GotoDatabaseDialog.strings
diff --git a/Resources/English.lproj/IndexesView.strings b/Resources/English.lproj/IndexesView.strings
index 5fd8124f..c306f39b 100644
--- a/Resources/English.lproj/IndexesView.strings
+++ b/Resources/English.lproj/IndexesView.strings
diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings
index f54e1fab..a571d298 100644
--- a/Resources/English.lproj/Localizable.strings
+++ b/Resources/English.lproj/Localizable.strings
diff --git a/Resources/English.lproj/MainMenu.strings b/Resources/English.lproj/MainMenu.strings
index f97b133c..b5593a7d 100644
--- a/Resources/English.lproj/MainMenu.strings
+++ b/Resources/English.lproj/MainMenu.strings
diff --git a/Resources/English.lproj/MainWindow.strings b/Resources/English.lproj/MainWindow.strings
index 2afdf3b5..1191d0d2 100644
--- a/Resources/English.lproj/MainWindow.strings
+++ b/Resources/English.lproj/MainWindow.strings
diff --git a/Resources/English.lproj/Navigator.strings b/Resources/English.lproj/Navigator.strings
index d7debae9..778dbcf2 100644
--- a/Resources/English.lproj/Navigator.strings
+++ b/Resources/English.lproj/Navigator.strings
diff --git a/Resources/English.lproj/Preferences.strings b/Resources/English.lproj/Preferences.strings
index 91395b5b..8248bf70 100644
--- a/Resources/English.lproj/Preferences.strings
+++ b/Resources/English.lproj/Preferences.strings
diff --git a/Resources/English.lproj/QueryFavoriteManager.strings b/Resources/English.lproj/QueryFavoriteManager.strings
index 8edb8e1b..622a6341 100644
--- a/Resources/English.lproj/QueryFavoriteManager.strings
+++ b/Resources/English.lproj/QueryFavoriteManager.strings
diff --git a/Resources/English.lproj/SaveSPFAccessory.strings b/Resources/English.lproj/SaveSPFAccessory.strings
index 9265656d..cd1f559c 100644
--- a/Resources/English.lproj/SaveSPFAccessory.strings
+++ b/Resources/English.lproj/SaveSPFAccessory.strings
diff --git a/Resources/English.lproj/UserManagerView.strings b/Resources/English.lproj/UserManagerView.strings
index c078b1d1..7d494fdb 100644
--- a/Resources/English.lproj/UserManagerView.strings
+++ b/Resources/English.lproj/UserManagerView.strings
diff --git a/Resources/Images/reset.pdf b/Resources/Images/reset.pdf
new file mode 100644
index 00000000..2ac66017
--- /dev/null
+++ b/Resources/Images/reset.pdf
diff --git a/Resources/License.rtf b/Resources/License.rtf
index 8d733b9b..a9ce83c0 100644
--- a/Resources/License.rtf
+++ b/Resources/License.rtf
@@ -5,7 +5,7 @@
 \deftab560
 \pard\tx560\pardeftab560\pardirnatural
 
-\f0\b\fs22 \cf2 \CocoaLigature0 Copyright (c) 2002-2014 Sequel Pro & CocoaMySQL Teams. \
+\f0\b\fs22 \cf2 \CocoaLigature0 Copyright (c) 2002-2015 Sequel Pro & CocoaMySQL Teams. \
 \
 All rights reserved.
 \b0 \