Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

stable history: reword UI texts in "pending bundle on exit" dialog

The previous question "Pull these incoming changes, or discard?"
didn't fit that well with the available buttons "Accept" and "Reject".

The text in the dialog used the words "pull" and "discard", but the
button labels are "Accept" and "Reject".

Consistently using the terms "accept" and "reject" in the dialog
text *and* the button labels now.

I also replaced the word "Incoming" with "new" in the dialog title,
since the bundle can have been added by using "Add Bundle..." from the
"Synchronize" menu as well (not just by using the "Incoming" command).

Changeset af67adf14323…

Parent 1788ca3385fa…

by Adrian Buehlmann

Changes to one file · Browse files at af67adf14323 Showing diff from parent 1788ca3385fa Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
71
72
73
 
 
74
75
76
 
 
 
77
78
79
 
71
72
73
74
75
76
 
 
77
78
79
80
81
82
@@ -71,9 +71,12 @@
  def should_live(self, widget=None, event=None):   live = False   if self.bfile: + t = _('New changesets from the preview bundle are still pending.') + t += _('\n\nAccept or reject the new changesets?')   # response: 0=Yes, 1=No, 2=Cancel - response = gdialog.CustomPrompt(_('Accept Incoming Changes?'), - _('Pull these incoming changes, or discard?'), self, + response = gdialog.CustomPrompt(_('Accept new Changesets'), + t, + self,   (_('&Accept'), _('&Reject'), _('&Cancel')), 2, 2).run()   if response == 0:   self.apply_clicked(None)