# HG changeset patch
# User Adrian Buehlmann <adr...@cadifra.com>
# Date 1255867593 -7200
# Node ID 665db90b26a2e00c3dcccc1805b9c63f834d9eb9
# Parent 071ea4834dc483df6fee2056abfd99790caea8cf
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).
diff --git a/tortoisehg/hgtk/history.py b/tortoisehg/hgtk/history.py
--- a/tortoisehg/hgtk/history.py
+++ b/tortoisehg/hgtk/history.py
@@ -71,9 +71,12 @@ class GLog(gdialog.GDialog):
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)
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
