Commits

Steve Borho committed bd134fa

hgtk: use one consistent 'please wait..' string

  • Participants
  • Parent commits a871177
  • Branches stable

Comments (0)

Files changed (3)

File tortoisehg/hgtk/history.py

                     status=_('Finding pending Perforce changelists...'),
                     title=_('Pending Perforce changelists')):
             gdialog.Prompt(_('Cannot run now'),
-                           _('Please try again after running '
-                             'operation is completed'), self).run()
+                           _('Please try again after the previous '
+                             'command has completed'), self).run()
 
     def p4identify(self, button):
         cmd = ['hg', 'p4identify']
                     status=_('Finding tip Perforce changelist...'),
                     title=_('Identifying Perforce tip')):
             gdialog.Prompt(_('Cannot run now'),
-                           _('Please try again after running '
-                             'operation is completed'), self).run()
+                           _('Please try again after the previous '
+                             'command has completed'), self).run()
 
     def more_clicked(self, button, data=None):
         self.graphview.next_revision_batch(self.limit)
                     status=_('Applying bundle...'),
                     title=_('Applying bundle')):
             gdialog.Prompt(_('Cannot run now'),
-                           _('Please try again after running '
-                             'operation is completed'), self).run()
+                           _('Please try again after the previous '
+                             'command has completed'), self).run()
 
     def remove_overlay(self, resettip):
         self.bfile = None
                     status=_('Checking incoming changesets...'),
                     title=_('Incoming')):
             gdialog.Prompt(_('Cannot run now'),
-                           _('Please try again after running '
-                             'operation is completed'), self).run()
+                           _('Please try again after the previous '
+                             'command has completed'), self).run()
 
     def set_bundlefile(self, bfile, **kwopts):
         self.origurl = self.urlcombo.get_active()
                     status=_('Pulling changesets...'),
                     title=_('Pull')):
             gdialog.Prompt(_('Cannot run now'),
-                           _('Please try again after running '
-                             'operation is completed'), self).run()
+                           _('Please try again after the previous '
+                             'command has completed'), self).run()
 
     def outgoing_clicked(self, toolbutton):
         path = hglib.fromutf(self.pathentry.get_text()).strip()
                     status=_('Checking outgoing changesets...'),
                     title=_('Outgoing')):
             gdialog.Prompt(_('Cannot run now'),
-                           _('Please try again after running '
-                             'operation is completed'), self).run()
+                           _('Please try again after the previous '
+                             'command has completed'), self).run()
 
     def email_clicked(self, toolbutton):
         path = hglib.fromutf(self.pathentry.get_text()).strip()
                     status=_('Pushing changesets...'),
                     title=_('Push')):
             gdialog.Prompt(_('Cannot run now'),
-                           _('Please try again after running '
-                             'operation is completed'), self).run()
+                           _('Please try again after the previous '
+                             'command has completed'), self).run()
 
     def conf_clicked(self, *args):
         newpath = hglib.fromutf(self.pathentry.get_text()).strip()
             self.stbar.set_idle_text(text)
         if not self.execute_command(cmdline, callback, status, _('Bundling')):
             gdialog.Prompt(_('Cannot run now'),
-                           _('Please try again after running '
-                             'operation is completed'), self).run()
+                           _('Please try again after the previous '
+                             'command has completed'), self).run()
 
     def qimport_rev(self, menuitem):
         """QImport selected revision."""
         if not self.execute_command(cmdline, callback, title=_('Importing'),
                                     status=_('Importing to Patch Queue...')):
             gdialog.Prompt(_('Cannot run now'),
-                           _('Please try again after running '
-                             'operation is completed'), self).run()
+                           _('Please try again after the previous '
+                             'command has completed'), self).run()
 
     def rebase_selected(self, menuitem):
         """Rebase revision on top of selection (1st on top of 2nd).""" 
                     status=_('Pushing changesets to revision %s...') % rev,
                     title=_('Push to %s') % rev):
             gdialog.Prompt(_('Cannot run now'),
-                           _('Please try again after running '
-                             'operation is completed'), self).run()
+                           _('Please try again after the previous '
+                             'command has completed'), self).run()
 
     def pull_to(self, menuitem):
         rev = str(self.currevid)
                     status=_('Pulling changesets to revision %s...') % rev,
                     title=_('Pull to %s') % rev):
             gdialog.Prompt(_('Cannot run now'),
-                           _('Please try again after running '
-                             'operation is completed'), self).run()
+                           _('Please try again after the previous '
+                             'command has completed'), self).run()
 
     def copy_hash(self, menuitem):
         hash = self.repo[self.currevid].hex()

File tortoisehg/hgtk/recovery.py

     def _exec_cmd(self, cmd, postfunc=None):
         if self._cmd_running():
             dialog.error_dialog(self, _('Cannot run now'),
-                _('Please try again after the previous command is completed'))
+                _('Please try again after the previous command has completed'))
             return
 
         self._stop_button.set_sensitive(True)

File tortoisehg/hgtk/synch.py

     def exec_cmd(self, cmd):
         if self.cmd_running():
             dialog.error_dialog(self, _('Cannot run now'),
-                _('Please try again after the previous command is completed'))
+                _('Please try again after the previous command has completed'))
             return
 
         self.stop_button.set_sensitive(True)