The Trunk: Monticello-mt.626.mcz

Marcel Taeumel uploaded a new version of Monticello to project The Trunk:
http://source.squeak.org/trunk/Monticello-mt.626.mcz

==================== Summary ====================

Name: Monticello-mt.626
Author: mt
Time: 5 February 2016, 3:31:51.167206 pm
UUID: acbb6499-5073-4512-b488-22b5ce5a0d8b
Ancestors: Monticello-eem.625

Clarify button labels in Merge Browser consistently.

=============== Diff against Monticello-eem.625 ===============

Item was changed:
  ----- Method: MCMergeBrowser>>buttonSpecs (in category 'as yet unclassified') -----
  buttonSpecs
  ^ #((Merge merge 'Proceed with the merge' canMerge)
  (Cancel cancel 'Cancel the merge')
  ('All Newer' chooseAllNewerConflicts 'Choose all newer conflict versions')
  ('All Older' chooseAllOlderConflicts 'Choose all older conflict versions')
+ ('Rest Reject' chooseAllUnchosenLocal 'Choose local versions of all remaining conflicts')
+ ('Rest Accept' chooseAllUnchosenRemote 'Choose remote versions of all remaining conflicts')
- ('Rest Local' chooseAllUnchosenLocal 'Choose local versions of all remaining conflicts')
- ('Rest Remote' chooseAllUnchosenRemote 'Choose remote versions of all remaining conflicts')
  )!

Item was changed:
  ----- Method: MCMergeBrowser>>innerButtonSpecs (in category 'as yet unclassified') -----
  innerButtonSpecs
  ^
+ #((Accept chooseRemote 'Accept the selected incoming change. Overwrites local code.' )
+  (Reject chooseLocal 'Reject the selected incoming change. Retains local code.' ))!
- #((Keep chooseRemote 'keep the selected change' )
-  (Reject chooseLocal 'reject the selected change' ))!