aboutsummaryrefslogtreecommitdiffstats
path: root/Interfaces
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2010-12-11 21:52:44 +0000
committerstuconnolly <stuart02@gmail.com>2010-12-11 21:52:44 +0000
commit1ddca4732c3aa46698b8fad25ce1294db3cd32fb (patch)
tree177ce5977ef37ea98ceae04bbce2f9ba73a0da4d /Interfaces
parent66f0041a06b8710cd3ed3b5ff2c8cbb54004efba (diff)
parentcb2baf9cb4ce1e33e6756969b1f71eb0e011f2c8 (diff)
downloadsequelpro-1ddca4732c3aa46698b8fad25ce1294db3cd32fb.tar.gz
sequelpro-1ddca4732c3aa46698b8fad25ce1294db3cd32fb.tar.bz2
sequelpro-1ddca4732c3aa46698b8fad25ce1294db3cd32fb.zip
Bring outlineview branch up to date with trunk (r2989:3005).
Diffstat (limited to 'Interfaces')
-rw-r--r--Interfaces/English.lproj/BundleEditor.xib25
1 files changed, 17 insertions, 8 deletions
diff --git a/Interfaces/English.lproj/BundleEditor.xib b/Interfaces/English.lproj/BundleEditor.xib
index 8bcfbdd1..8f224ad4 100644
--- a/Interfaces/English.lproj/BundleEditor.xib
+++ b/Interfaces/English.lproj/BundleEditor.xib
@@ -23,7 +23,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="686"/>
+ <integer value="683"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -351,7 +351,7 @@
</object>
<object class="NSMenuItem" id="18029675">
<reference key="NSMenu" ref="973574710"/>
- <string key="NSTitle">Save Bundle…</string>
+ <string key="NSTitle">Export Bundle…</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="545549031"/>
@@ -383,6 +383,7 @@
</object>
</object>
</object>
+ <int key="NSSelectedIndex">3</int>
<bool key="NSPullDown">YES</bool>
<int key="NSPreferredEdge">1</int>
<bool key="NSUsesItemFromMenu">YES</bool>
@@ -3261,6 +3262,7 @@
<string>904.IBPluginDependency</string>
<string>908.IBPluginDependency</string>
<string>909.IBPluginDependency</string>
+ <string>920.IBAttributePlaceholdersKey</string>
<string>920.IBPluginDependency</string>
<string>932.IBAttributePlaceholdersKey</string>
<string>932.IBPluginDependency</string>
@@ -3432,7 +3434,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.brandonwalkin.BWToolkit</string>
- <string>{{230, 222}, {243, 98}}</string>
+ <string>{{222, 223}, {243, 98}}</string>
<string>com.brandonwalkin.BWToolkit</string>
<string>com.brandonwalkin.BWToolkit</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3473,11 +3475,10 @@
<string>{{430, 598}, {167, 4}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
- <string key="NS.key.0">ToolTip</string>
- <object class="IBToolTipAttribute" key="NS.object.0">
- <string key="name">ToolTip</string>
- <reference key="object" ref="994416682"/>
- <string key="toolTip">Alphanumeric character string which inserts the favorite query string after expansion by pressing the ⇥ key.</string>
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3546,6 +3547,14 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <object class="NSMutableDictionary">
+ <string key="NS.key.0">ToolTip</string>
+ <object class="IBToolTipAttribute" key="NS.object.0">
+ <string key="name">ToolTip</string>
+ <reference key="object" ref="18029675"/>
+ <string key="toolTip">Save the selected Bundle to disk</string>
+ </object>
+ </object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
<string key="NS.key.0">ToolTip</string>