timeless avatar timeless committed 6d1eb24

commit: remove confusing text from branch messages and move actions to buttons

Comments (0)

Files changed (1)

tortoisehg/hgqt/commit.py

                     resp = qtlib.CustomPrompt(_('Confirm Branch Change'),
                         _('Named branch "%s" already exists, '
                           'last used in revision %d\n'
-                          'Yes\t- Make commit restarting this named branch\n'
-                          'No\t- Make commit without changing branch\n'
-                          'Cancel\t- Cancel this commit') % (self.branchop, rev),
-                          self, (_('&Yes'), _('&No'), _('Cancel')), 2, 2).run()
+                          ) % (self.branchop, rev),
+                        self,
+                        (_('Restart &Branch'),
+                         _('&Commit to current branch'),
+                         _('Cancel')), 2, 2).run()
             else:
                 resp = qtlib.CustomPrompt(_('Confirm New Branch'),
                     _('Create new named branch "%s" with this commit?\n'
-                      'Yes\t- Start new branch with this commit\n'
-                      'No\t- Make commit without branch change\n'
-                      'Cancel\t- Cancel this commit') % self.branchop,
-                    self, (_('&Yes'), _('&No'), _('Cancel')), 2, 2).run()
+                      ) % self.branchop,
+                    self,
+                    (_('Create &Branch'),
+                     _('&Commit to current branch'),
+                     _('Cancel')), 2, 2).run()
             if resp == 0:
                 newbranch = True
                 commandlines.append(['branch', '--repository', repo.root,
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.