Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.3, 2.0.4, and 2.0.5

stable resolve: improve button names (closes #81)

Renamed 'Auto Resolve' to 'Mercurial Resolve', as suggested by Johan
Renamed 'Manual Resolve' to 'Tool Resolve'. Also improved both tooltips a bit.

I chose not to use the selected tool name in the button because it would affect
the layout of the resolve tool.

Changeset 7c905f0daee9…

Parent 77b541ba8ecb…

by Steve Borho

Changes to one file · Browse files at 7c905f0daee9 Showing diff from parent 77b541ba8ecb Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​resolve.py Stacked
 
54
55
56
57
58
 
 
59
60
61
 
 
62
63
64
 
54
55
56
 
 
57
58
59
 
 
60
61
62
63
64
@@ -54,11 +54,11 @@
  vbox = QVBoxLayout()   vbox.setContentsMargins(*MARGINS)   hbox.addLayout(vbox) - auto = QPushButton(_('Auto Resolve')) - auto.setToolTip(_('Attempt automatic merge')) + auto = QPushButton(_('Mercurial Resolve')) + auto.setToolTip(_('Attempt automatic (trivial) merge'))   auto.clicked.connect(lambda: self.merge('internal:merge')) - manual = QPushButton(_('Manual Resolve')) - manual.setToolTip(_('Merge with selected merge tool')) + manual = QPushButton(_('Tool Resolve')) + manual.setToolTip(_('Merge using selected merge tool'))   manual.clicked.connect(self.merge)   local = QPushButton(_('Take Local'))   local.setToolTip(_('Accept the local file version (yours)'))