Changeset 22199c69841f…
Parent 6a4e8480cf60…
by
Changes to 4 files · Browse files at 22199c69841f Showing diff from parent 6a4e8480cf60 Diff from another changeset...
@@ -126,10 +126,10 @@
# options
option_box = gtk.VBox()
- self.optupdate = gtk.CheckButton(_('do not update the new working directory'))
- self.optpull = gtk.CheckButton(_('use pull protocol to copy metadata'))
- self.optuncomp = gtk.CheckButton(_('use uncompressed transfer'))
- self.optproxy = gtk.CheckButton(_('use proxy server'))
+ self.optupdate = gtk.CheckButton(_('Do not update the new working directory'))
+ self.optpull = gtk.CheckButton(_('Use pull protocol to copy metadata'))
+ self.optuncomp = gtk.CheckButton(_('Use uncompressed transfer'))
+ self.optproxy = gtk.CheckButton(_('Use proxy server'))
option_box.pack_start(self.optupdate, False, False)
option_box.pack_start(self.optpull, False, False)
option_box.pack_start(self.optuncomp, False, False)
@@ -142,7 +142,7 @@ self.optproxy.set_sensitive(False)
# remote cmd
- lbl = gtk.Label(_('Remote Cmd:'))
+ lbl = gtk.Label(_('Remote command:'))
lbl.set_alignment(0, 0.5)
self.remotecmdentry = gtk.Entry()
vbox.pack_start(self.remotecmdentry, False, False, 1)
|
@@ -272,7 +272,7 @@ cell = gtk.CellRendererText()
self.msg_cbbox.pack_start(cell, True)
self.msg_cbbox.add_attribute(cell, 'text', 0)
- liststore.append([_('Recent Commit Messages...'), ''])
+ liststore.append([_('Recent commit messages...'), ''])
self.msg_cbbox.set_active(0)
self.popupid = self.msg_cbbox.connect('notify::popup-shown',
self.first_msg_popdown)
@@ -539,14 +539,14 @@
def undo_clicked(self, toolbutton, data=None):
- response = gdialog.Confirm(_('Confirm Undo commit'),
+ response = gdialog.Confirm(_('Confirm Undo Commit'),
[], self, _('Undo last commit')).run()
if response != gtk.RESPONSE_YES:
return
tip = self.get_tip_rev(True)
if not tip == self.last_commit_id:
- gdialog.Prompt(_('Undo commit'),
+ gdialog.Prompt(_('Undo Commit'),
_('Unable to undo!\n\n'
'Tip revision differs from last commit.'),
self).run()
@@ -561,7 +561,7 @@ time.sleep(0.5) # give fs some time to pick up changes
shlib.shell_notify([os.getcwd()])
except:
- gdialog.Prompt(_('Undo commit'),
+ gdialog.Prompt(_('Undo Commit'),
_('Errors during rollback!'), self).run()
@@ -775,7 +775,7 @@ sumlen = 0
maxlen = 0
if not (sumlen or maxlen):
- gdialog.Prompt(_('Info required'),
+ gdialog.Prompt(_('Info Required'),
_('Message format needs to be configured'),
self).run()
self.msg_config(None)
|
@@ -178,7 +178,7 @@ self.force = gtk.CheckButton(_('Force pull or push'))
self.tips.set_tip(self.force, _('Run even when remote repository'
' is unrelated.'))
- self.use_proxy = gtk.CheckButton(_('use proxy server'))
+ self.use_proxy = gtk.CheckButton(_('Use proxy server'))
if ui.ui().config('http_proxy', 'host', ''):
self.use_proxy.set_active(True)
else:
@@ -189,7 +189,7 @@ ## target revision option
revhbox = gtk.HBox()
self.reventry = gtk.Entry()
- revhbox.pack_start(gtk.Label(_('Target Revision:')), False, False, 2)
+ revhbox.pack_start(gtk.Label(_('Target revision:')), False, False, 2)
revhbox.pack_start(self.reventry, True, True, 2)
reveventbox = gtk.EventBox()
reveventbox.add(revhbox)
@@ -199,7 +199,7 @@ ## remote command option
cmdhbox = gtk.HBox()
self.cmdentry = gtk.Entry()
- cmdhbox.pack_start(gtk.Label(_('Remote Command:')), False, False, 2)
+ cmdhbox.pack_start(gtk.Label(_('Remote command:')), False, False, 2)
cmdhbox.pack_start(self.cmdentry, True, True, 2)
cmdeventbox = gtk.EventBox()
cmdeventbox.add(cmdhbox)
@@ -216,9 +216,9 @@ frame = gtk.Frame(_('Incoming/Outgoing'))
opthbox.pack_start(frame, False, False, 2)
- self.showpatch = gtk.CheckButton(_('Show Patches'))
- self.newestfirst = gtk.CheckButton(_('Show Newest First'))
- self.nomerge = gtk.CheckButton(_('Show No Merges'))
+ self.showpatch = gtk.CheckButton(_('Show patches'))
+ self.newestfirst = gtk.CheckButton(_('Show newest first'))
+ self.nomerge = gtk.CheckButton(_('Show no merges'))
iovbox = gtk.VBox()
iovbox.pack_start(self.showpatch, False, False, 2)
|
@@ -25,7 +25,7 @@ _pwfields = ('http_proxy.passwd', 'smtp.password')
_tortoise_info = (
- (_('3-way Merge Tool'), 'ui.merge', [],
+ (_('Three-way Merge Tool'), 'ui.merge', [],
_('Graphical merge program for resolving merge conflicts. If left'
' unspecified, Mercurial will use the first applicable tool it finds'
' on your system or use its internal merge tool that leaves conflict'
|
Loading...