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

stable resolve: use Exit instead of Quit - at least on Windows

Changeset 3e3cb9cd4027…

Parent 0ae5ac9ebac2…

by timeless

Changes to one file · Browse files at 3e3cb9cd4027 Showing diff from parent 0ae5ac9ebac2 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​resolve.py Stacked
 
311
312
313
314
 
315
316
 
317
318
319
 
311
312
313
 
314
315
 
316
317
318
319
@@ -311,9 +311,9 @@
  s = QSettings()   s.setValue('resolve/geom', self.saveGeometry())   if len(self.utree.model()): - main = _('Quit without finishing resolve?') + main = _('Exit without finishing resolve?')   text = _('Unresolved conflicts remain. Are you sure?') - labels = ((QMessageBox.Yes, _('&Quit')), + labels = ((QMessageBox.Yes, _('E&xit')),   (QMessageBox.No, _('Cancel')))   if not qtlib.QuestionMsgBox(_('Confirm Exit'), main, text,   labels=labels, parent=self):