Update tooltips for Push, Pull and Rebase buttons to better reflect what will happen.

This commit is contained in:
André Berg
2009-11-07 01:00:39 +01:00
parent 2cc3c730d6
commit d04c639730
+18 -7
View File
@@ -21,9 +21,9 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="375"/>
<integer value="4"/>
<integer value="354"/>
<integer value="236"/>
<integer value="4"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -611,7 +611,7 @@
<object class="NSTextView" id="75600241">
<reference key="NSNextResponder" ref="321980917"/>
<int key="NSvFlags">2322</int>
<string key="NSFrameSize">{610, 98}</string>
<string key="NSFrameSize">{610, 0}</string>
<reference key="NSSuperview" ref="321980917"/>
<object class="NSTextContainer" key="NSTextContainer" id="480935218">
<object class="NSLayoutManager" key="NSLayoutManager">
@@ -1397,7 +1397,10 @@
</object>
<string key="NSToolbarItemLabel">Push</string>
<string key="NSToolbarItemPaletteLabel">Push</string>
<string key="NSToolbarItemToolTip">Push local changes to remote</string>
<string type="base64-UTF8" key="NSToolbarItemToolTip">J2dpdCBwdXNoIDxyZW1vdGUgb3JpZ2luPjxsb2NhbCBicmFuY2g+JwoKPHJlbW90ZSBvcmlnaW4+IGlz
IHRoZSBkZWZhdWx0IHJlbW90ZSBjb25maWd1cmVkIGZvciB0aGUgY3VycmVudGx5IHNlbGVjdGVkIGJy
YW5jaCBmcm9tIHRoZSBicmFuY2ggcG9wdXAgbWVudS4gCgpOb3RlOiB0aGUgYnJhbmNoIGhhcyB0byBi
ZSBzcGVjaWZpYy4gCidBbGwgYnJhbmNoZXMnIHdpbGwgbm90IHdvcmsuA</string>
<object class="NSButton" key="NSToolbarItemView" id="1070051133">
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
@@ -1439,7 +1442,11 @@
</object>
<string key="NSToolbarItemLabel">Pull</string>
<string key="NSToolbarItemPaletteLabel">Pull</string>
<string key="NSToolbarItemToolTip">Pull latest changes from remote</string>
<string type="base64-UTF8" key="NSToolbarItemToolTip">J2dpdCBwdWxsIDxyZW1vdGUgb3JpZ2luPjxsb2NhbCBicmFuY2g+JwoKPHJlbW90ZSBvcmlnaW4+IGlz
IHRoZSBkZWZhdWx0IHJlbW90ZSBjb25maWd1cmVkIGZvciA8bG9jYWwgYnJhbmNoPi4KPGxvY2FsIGJy
YW5jaD4gaXMgdGhlIHNlbGVjdGVkIGJyYW5jaCBmcm9tIHRoZSBicmFuY2ggcG9wdXAgbWVudS4gCgpO
b3RlOiB0aGUgYnJhbmNoIGhhcyB0byBiZSBzcGVjaWZpYy4gCidBbGwgYnJhbmNoZXMnIHdpbGwgbm90
IHdvcmsuA</string>
<object class="NSButton" key="NSToolbarItemView" id="665398151">
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
@@ -1481,7 +1488,11 @@
</object>
<string key="NSToolbarItemLabel">Rebase</string>
<string key="NSToolbarItemPaletteLabel">Rebase</string>
<string key="NSToolbarItemToolTip">Rebase local changes with latest</string>
<string type="base64-UTF8" key="NSToolbarItemToolTip">J2dpdCBwdWxsIDxyZW1vdGUgb3JpZ2luPiAtLXJlYmFzZScKCkluc3RlYWQgb2YgYSBtZXJnZSwgcGVy
Zm9ybSBhIHJlYmFzZSBhZnRlciBmZXRjaGluZy4gCgpJZiB0aGVyZSBpcyBhIHJlbW90ZSByZWYgZm9y
IHRoZSB1cHN0cmVhbSBicmFuY2gsIGFuZCB0aGlzIGJyYW5jaCB3YXMgcmViYXNlZCBzaW5jZSBsYXN0
IGZldGNoZWQsIHRoZSByZWJhc2UgdXNlcyB0aGF0IGluZm9ybWF0aW9uIHRvIGF2b2lkIHJlYmFzaW5n
IG5vbi1sb2NhbCBjaGFuZ2VzLiA</string>
<object class="NSButton" key="NSToolbarItemView" id="166309462">
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
@@ -1581,9 +1592,9 @@
<reference ref="773751720"/>
<reference ref="348901587"/>
<reference ref="520297562"/>
<reference ref="1033703265"/>
<reference ref="412717087"/>
<reference ref="425122427"/>
<reference ref="1033703265"/>
<reference ref="587605996"/>
</object>
<object class="NSMutableArray" key="NSToolbarIBDefaultItems">