Merge lp:~jelmer/qbrz/codespell into lp:qbrz

[Jelmer Vernooij]

Fix spelling errors in code

Fix spelling errors

-------8<-------
SUMMARY:
actualy 3
alphabeticaly 2
ansestor 1
arround 1
ategory 2
automaticly 2
availible 3
becuse 1
blured 1
brach 1
changeing 1
colapse 4
colapses 1
colum 1
combinated 1
commitable 1
compatabile 1
consistant 1
coresponding 1
correclty 1
correcly 1
defaul 1
diplayed 1
directoies 1
draging 1
entires 1
eqivalents 1
execption 1
exisiting 1
foward 1
globaly 1
handeling 2
implictly 1
incase 1
incrementaly 1
interupt 2
lables 1
occurance 1
orignal 1
overriden 1
recived 1
recored 1
refesh 1
releated 1
renabled 1
renderd 1
reuseable 1
sepecified 2
seperate 1
shoud 1
somehwat 1
speciffied 1
specifing 1
stoping 5
successfull 3
syncronizing 1
thier 1
transaltions 1
trnaslations 1
typicaly 1
uncomitted 3
uncommited 1
unlikley 1
untill 1
usefull 2
usibility 1
visble 1
wont 1

Unmerged revisions

1668. By Jelmer Vernooij on 2024-11-17

Fix spelling errors

-------8<-------
SUMMARY:
actualy 3
alphabeticaly 2
ansestor 1
arround 1
ategory 2
automaticly 2
availible 3
becuse 1
blured 1
brach 1
changeing 1
colapse 4
colapses 1
colum 1
combinated 1
commitable 1
compatabile 1
consistant 1
coresponding 1
correclty 1
correcly 1
defaul 1
diplayed 1
directoies 1
draging 1
entires 1
eqivalents 1
execption 1
exisiting 1
foward 1
globaly 1
handeling 2
implictly 1
incase 1
incrementaly 1
interupt 2
lables 1
occurance 1
orignal 1
overriden 1
recived 1
recored 1
refesh 1
releated 1
renabled 1
renderd 1
reuseable 1
sepecified 2
seperate 1
shoud 1
somehwat 1
speciffied 1
specifing 1
stoping 5
successfull 3
syncronizing 1
thier 1
transaltions 1
trnaslations 1
typicaly 1
uncomitted 3
uncommited 1
unlikley 1
untill 1
usefull 2
usibility 1
visble 1
wont 1

=== modified file 'NEWS.txt'
--- NEWS.txt	2024-02-23 09:34:43 +0000
+++ NEWS.txt	2024-11-17 08:32:35 +0000
@@ -223,7 +223,7 @@
  * qconfig:
    * Fixed Set Default button in Merge tab. (Gordon Tyler, Bug #820635)
  * qdiff:
-   * Smart scroll syncronizing for side by side view (in complete mode).
+   * Smart scroll synchronizing for side by side view (in complete mode).
      (IWATA Hidetaka)
    * Fixed ignore whitespace changes code.
      (Alexander Belchenko, Bug #827391)
@@ -517,7 +517,7 @@
  * qcommit: added option to load commit message from a file.
    (Bug #640071, Philip Peitsch)
  * qconflicts: fix bug with access to QBzr configuration. (Bug #675894)
- * When a interupt signal is recived, close rather than showing a error
+ * When a interrupt signal is received, close rather than showing a error
    message. (Gary van der Merwe)
  * qpush: fixed smart suggestion of new push URLs for lp branches.
    (Bug #710767, Alexander Belchenko)
@@ -568,7 +568,7 @@
  * qgetupdates: fixed API mismatch. (Bug #636510, Alexander Belchenko)
  * qlog:
    * better branch labels for `bzr qlog colo:` case. (Alexander Belchenko)
-   * give a size hint for the GraphTagsBugsItemDelegate so that blured
+   * give a size hint for the GraphTagsBugsItemDelegate so that blurred
      rendering on Windows with PyQt 4.7 is avoided. (Gary van der Merwe)
  * qrun: fixed '--execute' mode. (Bug #590229, Simon Kersey)
 
@@ -647,7 +647,7 @@
  * qlog: Improve performance by using KnownGraph. (John Arbash Meinel,
    Gary van der Merwe)
  * TreeWidget dialogs (qcommit, qadd, qrevert, qbrowse):
-   Performance improvements for select all, and changeing filters.
+   Performance improvements for select all, and changing filters.
    (Bug #513105, Bug #476641, Gary van der Merwe)
  * Improve startup performance by using lazy imports. (Gary van der Merwe)
 
@@ -772,7 +772,7 @@
    qbrowse (for revision tree) if revno bigger than 9999.
    (Bug #505990, Alexander Belchenko)
  * Changed buttons behavior in subprocess-based dialogs: if the operation
-   failed then show Retry button (instead of OK), at the successfull finish
+   failed then show Retry button (instead of OK), at the successful finish
    show only Close button. (Simon Kersey)
  * qrun has new option --execute which allows to run the supplied command
    immediately. If the command failed user can edit the command and its
@@ -828,7 +828,7 @@
    * The properties box in the message box now follow the theme, and hence are
      now readable on dark themes. (Bug #407070, Gary van der Merwe)
    * Parents and children in the message box are now show with a dot, of the
-     same color as thier dot in the graph. (Gary van der Merwe)
+     same color as their dot in the graph. (Gary van der Merwe)
  * qcat:
    * Line numbers are now shown when viewing text files. (Gary van der Merwe)
  * qannotate:
@@ -899,7 +899,7 @@
    * Don't show unchanged directories that contain ignored files.
      (Bug #462435, Gary van der Merwe)
  * qcommit, qadd, qrevert:
-   * Directoies with 4 or more sub items are grouped in the tree view.
+   * Directories with 4 or more sub items are grouped in the tree view.
      (Bug #456198, Gary van der Merwe)
    * Correct the old path shown for renamed files. (Bug #432572,
      Gary van der Merwe)
@@ -907,14 +907,14 @@
      directory. (Bug #435034, Gary van der Merwe)
    * For qcommit, It is now possible to select unversioned file and directories
      via the command line. (Gary van der Merwe)
-   * Automaticly expand to the check items on load. (Gary van der Merwe)
+   * Automatically expand to the check items on load. (Gary van der Merwe)
    * Fix View for unversoined files when run from a sub directory of the
      working tree. (Gary van der Merwe)
  * qcommit/qbrowse:
    * Conflicts are shown in the status column. External merge applications
      can be launched to resolve these conflicts, and the conflicts can be
      marked as merged. (Bug #174509, Gary van der Merwe)
-   * Improved the usibility of the context menu add, and revert actions.
+   * Improved the usability of the context menu add, and revert actions.
      These now directly use the api, rather than via subprocess. There is
      now no prompt for add. With large trees, there is less flicker when the
      tree is refreshed, and the scroll position is remembered.
@@ -955,7 +955,7 @@
    * update bound branch
    * update lightweight checkout
  * qlog can display foreign revision info if available.
- * Sort tags alphabeticaly and case-insensitive in qtag dialog.
+ * Sort tags alphabetically and case-insensitive in qtag dialog.
  * qexport now has sensible defaults and more user-friendly archive
    types (e.g. tar.gz instead of tgz) displayed in the combo box.
    On windows, the default archive type is now zip as well.
@@ -1014,7 +1014,7 @@
    * Very long command-line passed to qsubprocess via temp file
      regardless of platform. (#387320, Alexander Belchenko)
  * qtag:
-   * Sort tags alphabeticaly and case-insensitive. (#423075, Craig Hewetson)
+   * Sort tags alphabetically and case-insensitive. (#423075, Craig Hewetson)
    * Save/restore the size of dialog. (#435859, Craig Hewetson)
  * qupdate:
    * Now working for bound branches (aka heavyweight checkouts).
@@ -1125,11 +1125,11 @@
    * Fixed a bug where it was not possible to do any file list context menu
      actions on a file that was renamed in the revision that you were viewing.
      (Bug 418340)
-   * Fixed a graph layout bug, where if the first revions of a brach was
+   * Fixed a graph layout bug, where if the first revions of a branch was
      filter, there was no non direct line to it. (Bug 417895)
    * Removed superfluous twisties at the end of a filterted branch line.
      (Bug 419784)
-   * Fixed a bug where branch lables would show on the wrong revisions.
+   * Fixed a bug where branch labels would show on the wrong revisions.
      (Bug 423201)
  * qcommit:
    * Show a friendly error message when tring to commit a specific file,
@@ -1201,7 +1201,7 @@
    * Pressing Escape cancels the dialog.
    * Spelling suggestions are shown in the message context menu. (#395895)
    * If you dbl click on a pending merge, it will show the revision message,
-     which is usefull if you want to copy it.
+     which is useful if you want to copy it.
    * When the arguments are written to a file, thay are now encoded. (#398750)
    * Added a refresh button to reload changes. (#253777)
  * qcommit, qadd, and qrevert now reuse the widget from qbrowse. This means
@@ -1215,7 +1215,7 @@
      search filter and type * in the search entry.
  * qannotate:
    * It is now possible to annotate the working tree.
-   * Branch encoding setting is now correcly loaded. (#397753)
+   * Branch encoding setting is now correctly loaded. (#397753)
    * A minimum of 80 chars is now shown (#397756)
  * qdiff:
    * Use configured color for interline_changes_background.
@@ -1227,7 +1227,7 @@
 0.12 - 2009-07-08
 -----------------------
 Maintenance release: compatibility with bzr 1.17 (progress indicator for
-commands); branching into exisiting directory (with qbranch) works now
+commands); branching into existing directory (with qbranch) works now
 (require bzr 1.17); better support of unicode paths in various commands.
 
  * qbranch: now it's possible to branch into newly created empty directory.
@@ -1266,7 +1266,7 @@
 
 0.11.0 - 2009-06-11
 -----------------------
-Maintenance release: compatibility with bzr 1.16 (bencode releated changes),
+Maintenance release: compatibility with bzr 1.16 (bencode related changes),
 improved performance of qlog, more fixes for side-by-side qdiff, a dozen of
 various bugfixes.
 
@@ -1301,7 +1301,7 @@
     * Fixed a bug when clicking refresh with multiple branches open.
       (Bug #351633)
     * When viewing a remote branch, qlog will load the revisions from local
-      current directory if availible.
+      current directory if available.
     * Improvements to the graph layout.
     * When opening diffs, there is less of a delay.
     * When running qlog DIR, revisions that change the children of the directory
@@ -1362,7 +1362,7 @@
 This release is a minor regression fixing release, to be released in sync with
 bzr 1.12 final.
 
- * Fix bug where qinit was not working - correclty handle QString arguments
+ * Fix bug where qinit was not working - correctly handle QString arguments
    when starting a subprocess (Bug #327395)
 
 
@@ -1398,13 +1398,13 @@
 New features in this release: throbber, interactive password prompt,
 post_uncommit hook, new bug-url command. Dozen of bugs fixed as well.
 
- * Add post_uncommit hook to remember the uncomitted commit message.
+ * Add post_uncommit hook to remember the uncommitted commit message.
  * Add interactive prompt for password if access to the branch require it.
  * Add throbber feature: user will see message "Loading..." and animation
    when there is long operation in progress to indicate that qbzr window
    is not hang.
  * Command-line interface to QBzr commands now is much closer to
-   coresponding commands in bzr itself. Where possible commands
+   corresponding commands in bzr itself. Where possible commands
    options are reused from bzr. (#272359)
  * qcommit:
    * Commit without message is forbidden (#297606).
@@ -1462,7 +1462,7 @@
 not only C/Python; qcommit trying to spell check your commit message,
 if you have PyEnchant installed; qannotate and qdiff(!) highlight
 syntax of source code files; qlog can use bzr-search plugin for
-searching in history; qlog can show combinated history for several
+searching in history; qlog can show combined history for several
 branches from one shared repository.
 
 Here the list of most user-visible changes since 0.9.3:
@@ -1471,7 +1471,7 @@
     * Added new commands.
  * qannotate:
     * A working tree is no longer required to annotate a file.
-    * The column widths are resize automaticly.
+    * The column widths are resize automatically.
     * Syntax highlighting of annotated file (Pygments library required).
  * qbrowse:
     * A context menu item has been added to annotate a file.
@@ -1585,8 +1585,8 @@
       files in any combination)
     * Show label '[binary file]' for modified binary files (#165006)
     * Images are shown in side by side diff. (#242083)
-    * Window loads straight away, and the diff loads incrementaly in the
-      background, showing files that have be diffed as the become availible.
+    * Window loads straight away, and the diff loads incrementally in the
+      background, showing files that have be diffed as the become available.
       (#174964)
     * Show changes in x bits. (#153817)
  * qlog:
@@ -1697,9 +1697,9 @@
 0.6.0 - 2007-09-06
 ------------------
 
- * Support for --fixes and --author eqivalents in the commit dialog.
+ * Support for --fixes and --author equivalents in the commit dialog.
  * Display fixed bugs in the log view.
- * Changed color of tags to yellow (to make it more consistant with gitk/hgk).
+ * Changed color of tags to yellow (to make it more consistent with gitk/hgk).
  * Faster diff viewing from the log window.
  * Pending merges in the commit dialog are now displayed as a flat list.
  * PyQt 4.3 fixes.

=== modified file 'README.md'
--- README.md	2024-01-31 23:48:45 +0000
+++ README.md	2024-11-17 08:32:35 +0000
@@ -98,7 +98,7 @@
 
 You can help to translate Qbrz interface to other languages.
 
-You can use either Launchpad trnaslations interface (it's preferable way)
+You can use either Launchpad translations interface (it's preferable way)
 see https://translations.launchpad.net/qbrz,
 or you can translate it offline, see instructions below.
 

=== modified file '__init__.py'
--- __init__.py	2024-02-22 15:03:06 +0000
+++ __init__.py	2024-11-17 08:32:35 +0000
@@ -176,10 +176,10 @@
 except ImportError:
     from breezy.branch import Branch
     Branch.hooks.install_named_hook('post_uncommit', post_uncommit_hook,
-        'Remember uncomitted revision data for qcommit')
+        'Remember uncommitted revision data for qcommit')
 else:
     install_lazy_named_hook("breezy.branch", "Branch.hooks", 'post_uncommit',
-        post_uncommit_hook, 'Remember uncomitted revision data for qcommit')
+        post_uncommit_hook, 'Remember uncommitted revision data for qcommit')
 
 
 def load_tests(basic_tests, module, loader):

=== modified file 'docs/make_release.txt'
--- docs/make_release.txt	2013-07-28 21:11:36 +0000
+++ docs/make_release.txt	2024-11-17 08:32:35 +0000
@@ -55,7 +55,7 @@
   version control) - ensure you're `bzr add` them before commit 
   (NOTE in NEWS.txt about new translations are very welcome).
 * Commit updated translations and push to Launchpad.
-* You'd better update transaltions before starting release process.
+* You'd better update translations before starting release process.
 
 
 Register release at Launchpad

=== modified file 'docs/slot-signal-mini-tutorial/slot-signal-mini-tutorial.txt'
--- docs/slot-signal-mini-tutorial/slot-signal-mini-tutorial.txt	2008-09-22 22:33:37 +0000
+++ docs/slot-signal-mini-tutorial/slot-signal-mini-tutorial.txt	2024-11-17 08:32:35 +0000
@@ -33,7 +33,7 @@
   will be called (and vice-versa).  I've previously told QtDesigner 
   that our form may send such a signal, and subprocess.py is where the actual 
   emit() of the signal happens.  As a result, we have the 2 groupboxes 
-  being automatically disabled when the subprocess starts and renabled 
+  being automatically disabled when the subprocess starts and re-enabled 
   if things fail.
 
 * The next item in the list if a signal from the 'but_init' widget, 

=== modified file 'lib/annotate.py'
--- lib/annotate.py	2024-02-22 15:03:06 +0000
+++ lib/annotate.py	2024-11-17 08:32:35 +0000
@@ -429,7 +429,7 @@
         if n:
             if n == 1:
                 # [bialix 2012/09/13] actually after loading annotation
-                # document implictly sets current position to the first line.
+                # document implicitly sets current position to the first line.
                 # So we're unable to change position to 1st line.
                 # Make a hack: select 2nd line, and then actually select 1st one.
                 self.go_to_line(2)

=== modified file 'lib/commands.py'
--- lib/commands.py	2024-01-31 23:48:45 +0000
+++ lib/commands.py	2024-11-17 08:32:35 +0000
@@ -135,7 +135,7 @@
     NOTES:
     1) q-command should define method '_qbrz_run' instead of 'run' (as in
        breezy).
-    2) The _qbrz_run method should return 0 for successfull exit
+    2) The _qbrz_run method should return 0 for successful exit
        and 1 if operation was cancelled by user.
     3) The _qbrz_run method can return None, in this case return code will be
        asked from self.main_window instance (if there is one).
@@ -155,7 +155,7 @@
         try:
             ui.ui_factory = QUIFactory()
 
-            # Handle interupt signal correctly.
+            # Handle interrupt signal correctly.
             signal.signal(signal.SIGINT, signal.SIG_DFL)
 
             # Set up global exception handling.
@@ -426,7 +426,7 @@
 
     By default show the log of the branch containing the working directory.
 
-    If multiple files are speciffied, they must be from the same branch.
+    If multiple files are specified, they must be from the same branch.
 
     :Examples:
         Log the current branch::
@@ -669,7 +669,7 @@
     @install_gettext
     @report_missing_pyqt
     def _do_qpreview(self, merger):
-        # Set up global execption handeling.
+        # Set up global exception handling.
         from breezy.plugins.qbrz.lib.trace import excepthook
         sys.excepthook = excepthook
 

=== modified file 'lib/diff.py'
--- lib/diff.py	2024-02-22 15:03:06 +0000
+++ lib/diff.py	2024-11-17 08:32:35 +0000
@@ -65,7 +65,7 @@
 
     if ext_diff == "":
 
-        # We can't import this globaly becuse it ties to import us,
+        # We can't import this globally because it ties to import us,
         # which causes and Import Error.
         from breezy.plugins.qbrz.lib.diffwindow import DiffWindow
 
@@ -577,7 +577,7 @@
         """
         Show diffs of specified file_ids.
         NOTE: Directories cannot be specified.
-              Use diff_tree or diff_paths instead when specifing directory.
+              Use diff_tree or diff_paths instead when specifying directory.
         """
         with ExitStack() as es:
             if lock_trees:

=== modified file 'lib/diff_arg.py'
--- lib/diff_arg.py	2024-01-31 23:48:45 +0000
+++ lib/diff_arg.py	2024-11-17 08:32:35 +0000
@@ -24,7 +24,7 @@
 
 # These classes were extracted from diff.py to avoid dependency on PyQt4
 # in commands.py where base provider class is used, but PyQt4 is not required
-# for overriden merge command.
+# for overridden merge command.
 
 class DiffArgProvider (object):
     """Contract class to pass arguments to either builtin diff window, or

=== modified file 'lib/diffview.py'
--- lib/diffview.py	2024-02-22 15:03:06 +0000
+++ lib/diffview.py	2024-11-17 08:32:35 +0000
@@ -620,7 +620,7 @@
                 texts = ["".join(l[ix[0]:ix[1]]) for l, ix in zip(lines, ixs)]
                 if use_pygments:
                     # This is what the pygments lexer does, so we need to do the
-                    # same incase we have \r\n line endings.
+                    # same in case we have \r\n line endings.
                     texts = ["\n".join(t.splitlines()) for t in texts]
 
                 texts = [split_words.findall(t) for t in texts]

=== modified file 'lib/diffwindow.py'
--- lib/diffwindow.py	2024-01-31 23:48:45 +0000
+++ lib/diffwindow.py	2024-11-17 08:32:35 +0000
@@ -311,7 +311,7 @@
         action.setCheckable(True)
         # RJLRJL removed spurious semi-colon (hmm...)
         action.setChecked(self.ignore_whitespace)
-        # RJLRJL this is the only occurance of connect_later.
+        # RJLRJL this is the only occurrence of connect_later.
         # self.connect_later(action, QtCore.SIGNAL("toggled (bool)"), self.click_ignore_whitespace)
         # ...which ends up with eventually needing to call process_delayed_connections, etc.
         # Get rid of it and do it normally

=== modified file 'lib/log.py'
--- lib/log.py	2024-01-31 23:48:45 +0000
+++ lib/log.py	2024-11-17 08:32:35 +0000
@@ -289,12 +289,12 @@
                         label = None
                     bi = BranchInfo(label, tree, br)
                     if len(branches) == 0:
-                        # The first sepecified branch becomes the primary
+                        # The first specified branch becomes the primary
                         # branch.
                         primary_bi = bi
                     branches.add(bi)
 
-                # If no locations were sepecified, don't do fileids
+                # If no locations were specified, don't do fileids
                 # Otherwise it gives you the history for the dir if you are
                 # in a sub dir.
                 if fp != '' and self.locations is None:
@@ -577,7 +577,7 @@
                     # Loading trees from a remote svn repo is unusably slow.
                     # See https://bugs.launchpad.net/qbrz/+bug/450225
                     # If only 1 revision is selected, use a optimized svn method
-                    # which actualy gets the server to do the delta,
+                    # which actually gets the server to do the delta,
                     # else, don't do any delta.
                     if count == 1:
                         delta = repos[0].get_revision_delta(revids[0])

=== modified file 'lib/loggraphviz.py'
--- lib/loggraphviz.py	2024-01-31 23:48:45 +0000
+++ lib/loggraphviz.py	2024-11-17 08:32:35 +0000
@@ -1436,7 +1436,7 @@
             self.graph_viz.throbber_hide()
 
     def has_changes(self, tree):
-        """Quickly check that the tree contains at least one commitable change.
+        """Quickly check that the tree contains at least one committable change.
 
         :param _from_tree: tree to compare against to find changes (default to
             the basis tree and is intended to be used by tests).

=== modified file 'lib/logmodel.py'
--- lib/logmodel.py	2024-01-31 23:48:45 +0000
+++ lib/logmodel.py	2024-11-17 08:32:35 +0000
@@ -305,7 +305,7 @@
         if role == RevIdRole:
             return c_rev.rev.revid
 
-        # Everything from here foward will need to have the revision loaded.
+        # Everything from here forward will need to have the revision loaded.
         if revision is None:
             return blank()
 

=== modified file 'lib/logwidget.py'
--- lib/logwidget.py	2024-02-22 15:03:06 +0000
+++ lib/logwidget.py	2024-11-17 08:32:35 +0000
@@ -638,7 +638,7 @@
                 penwidth = 1
                 pen.setWidth(penwidth)
                 pen.setCapStyle(QtCore.Qt.FlatCap)
-                # this is to try get lines 1 pixel wide to actualy be 1 pixel wide.
+                # this is to try get lines 1 pixel wide to actually be 1 pixel wide.
                 painter.translate(0.5, 0.5)
 
                 # Draw lines into the cell

=== modified file 'lib/revert.py'
--- lib/revert.py	2024-01-31 23:48:45 +0000
+++ lib/revert.py	2024-11-17 08:32:35 +0000
@@ -169,7 +169,7 @@
     # Unless:
     # * file_groupbox is unchecked - then all files are unchecked.
     #
-    # We keep a recored of what was checked, so that we we change something,
+    # We keep a recorded of what was checked, so that we we change something,
     # and then later we go back to a state where that change was not necessary,
     # we can return to what it was. This is stored in merges_base_checked, and
     # filelist_checked_base.

=== modified file 'lib/revisionmessagebrowser.py'
--- lib/revisionmessagebrowser.py	2024-01-31 23:48:45 +0000
+++ lib/revisionmessagebrowser.py	2024-11-17 08:32:35 +0000
@@ -236,7 +236,7 @@
                         for search, replace in search_replace:
                             message = re.sub(search, replace, message)
             else:
-                message = gettext("Uncommited Working Tree Changes")
+                message = gettext("Uncommitted Working Tree Changes")
 
             margin_left = (self.get_merge_depth(revid)-min_merge_depth)*20
             text = []

=== modified file 'lib/subprocess.py'
--- lib/subprocess.py	2024-01-31 23:48:45 +0000
+++ lib/subprocess.py	2024-11-17 08:32:35 +0000
@@ -215,7 +215,7 @@
     def make_default_layout_widgets(self):
         """Yields widgets to add to main dialog layout: status and button boxes.
         Status box has progress bar and console area.
-        Button box has 2 buttons: OK and Cancel (after successfull command
+        Button box has 2 buttons: OK and Cancel (after successful command
         execution there will be Close and Cancel).
         """
         yield self.make_default_status_box()
@@ -811,7 +811,7 @@
 
     def __init__(self, term_file):
         TextProgressView.__init__(self, term_file)
-        # The TextProgressView does not show the transport activity untill
+        # The TextProgressView does not show the transport activity until
         # there was a progress update. This changed because showing the
         # transport activity before a progress update would cause artifacts to
         # remain on the screen. We don't have to worry about that
@@ -846,7 +846,7 @@
     def make_progress_view(self):
         return SubprocessProgressView(self.stdout)
 
-    # This is to be compatabile with bzr less rev 4558
+    # This is to be compatible with bzr less rev 4558
     _make_progress_view = make_progress_view
 
     def clear_term(self):
@@ -1281,7 +1281,7 @@
 
     #
     # The returned list needs to have entries with strings, not bytes.
-    # **However**, the orignal code didn't try to convert the keys.
+    # **However**, the original code didn't try to convert the keys.
     # Instead, we now create a new_d of the same type as d.
     #
     # Get the type via type(d) and then instantiate id via () - hence

=== modified file 'lib/tests/modeltest.py'
--- lib/tests/modeltest.py	2023-09-21 12:50:49 +0000
+++ lib/tests/modeltest.py	2024-11-17 08:32:35 +0000
@@ -34,7 +34,7 @@
         QtCore.QObject.__init__(self,parent)
         self._model = _model
         # QAbstractItemModel gives us a simple table of rows and columns. Each item in it (cell)
-        # has a unique index via QtCore.QModelIndex with row, colum
+        # has a unique index via QtCore.QModelIndex with row, column
         # for example:
         #   0 1 2
         # 0 . , ,
@@ -231,7 +231,7 @@
         """
         Tests self.model's implementation of QtCore.QAbstractItemModel::parent()
         """
-        # Make sure the self.model wont crash and will return an invalid QtCore.QModelIndex
+        # Make sure the self.model won't crash and will return an invalid QtCore.QModelIndex
         # when asked for the parent of an invalid index
         assert(self.model.parent(QtCore.QModelIndex()) == QtCore.QModelIndex())
 
@@ -472,7 +472,7 @@
                 # We no longer check isValid(), just make sure it's not None
                 assert( self.model.data(index, QtCore.Qt.DisplayRole) is not None)
 
-                #if the next test fails here is some somehwat useful debug you play with
+                #if the next test fails here is some somewhat useful debug you play with
                 # if self.model.parent(index) != parent:
                 #   qDebug() << r << c << depth << self.model.data(index).toString()
                 #        << self.model.data(parent).toString()

=== modified file 'lib/tests/test_loggraphviz.py'
--- lib/tests/test_loggraphviz.py	2020-06-14 07:44:54 +0000
+++ lib/tests/test_loggraphviz.py	2024-11-17 08:32:35 +0000
@@ -243,7 +243,7 @@
 
     def test_with_working_tree_provider_filtered(self):
         # This test makes sure that label for a Working Tree shows for on it's
-        # nearest visble unique ansestor when the working tree node is
+        # nearest visible unique ancestor when the working tree node is
         # filtered.
         builder = self.make_branch_builder('branch')
         builder.start_series()
@@ -792,7 +792,7 @@
         # all should be showing
         self.assertFilteredRevisions('cba', state)
 
-        # colapse 'c'
+        # collapse 'c'
         state.collapse_expand_rev(gv.compute_viz(state).filtered_revs[0])
 
         # just mainline showing
@@ -838,9 +838,9 @@
         # all showing
         self.assertFilteredRevisions('fedcba', state)
 
-        # colapse 'd'
+        # collapse 'd'
         state.collapse_expand_rev(gv.compute_viz(state).filtered_revs[2])
-        # cause c expanded branchline eb, and d expanded c, d colapses
+        # cause c expanded branchline eb, and d expanded c, d collapses
         # just mainline showing
         self.assertFilteredRevisions('fda', state)
 
@@ -861,7 +861,7 @@
         # all showing
         self.assertFilteredRevisions('fedcba', state)
 
-        # colapse 'd'
+        # collapse 'd'
         state.collapse_expand_rev(gv.compute_viz(state).filtered_revs[2])
         # cause branchline eb was expanded by f, and not d, collapsing d dose
         # not collapse branchline eb, even though it expanded it
@@ -914,7 +914,7 @@
         # branchline c now showing (all showing)
         self.assertFilteredRevisions('gfedcba', state)
 
-        # colapse 'g'
+        # collapse 'g'
         state.collapse_expand_rev(gv.compute_viz(state).filtered_revs[0])
         # back to just mainline showing
         self.assertFilteredRevisions('ga', state)

=== modified file 'lib/trace.py'
--- lib/trace.py	2024-01-31 23:48:45 +0000
+++ lib/trace.py	2024-11-17 08:32:35 +0000
@@ -18,7 +18,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-"""Exception handeling and reporting.
+"""Exception handling and reporting.
 
 Please see docs/exception_reporting.txt for info on how to use this.
 """
@@ -58,7 +58,7 @@
 """
 SUB_LOAD_METHOD = 1
 """The exception is beening reported from the sub loading method.
-Does not cause the window to me closed. This is typicaly used when a user
+Does not cause the window to me closed. This is typically used when a user
 enters a branch location on one of our forms, and we try load that branch.
 """
 ITEM_OR_EVENT_METHOD = 2
@@ -127,7 +127,7 @@
         window.ret_code = error_type
 
     # XXX This is very similar to breezy.commands.exception_to_return_code.
-    # We shoud get bzr to refactor so that that this is reuseable.
+    # We should get bzr to refactor so that that this is reusable.
     if pdb:
         # With out this - pyQt shows lot of warnings. see:
         # http://www.riverbankcomputing.co.uk/static/Docs/PyQt4/pyqt4ref.html#using-pyqt-from-the-python-shell
@@ -164,7 +164,7 @@
 
         elif error_type == errors.EXIT_INTERNAL_ERROR:
             # this is a copy of breezy.trace.report_bug
-            # but we seperate the message, and the trace back,
+            # but we separate the message, and the trace back,
             # and addes a hyper link to the filebug page.
             traceback_file = StringIO()
             _breezy_print_exception(exc_info, traceback_file)
@@ -232,7 +232,7 @@
                 if isinstance(parent.title, str):
                     win_title = parent.title
                 elif isinstance(title, (list, tuple)):
-                    # just the first item is more usefull.
+                    # just the first item is more useful.
                     win_title = parent.title[0]
             else:
                 if hasattr(parent, 'windowTitle'):

=== modified file 'lib/treewidget.py'
--- lib/treewidget.py	2024-01-31 23:48:45 +0000
+++ lib/treewidget.py	2024-11-17 08:32:35 +0000
@@ -1236,7 +1236,7 @@
 
     def iter_checked(self, include_unchanged_dirs=True):
         """
-        Iterate over the list of checked items and emit the entires.
+        Iterate over the list of checked items and emit the entries.
 
         @param include_unchanged_dirs: should we include unchanged directories
             or skip them.
@@ -1497,7 +1497,7 @@
         header = self.header()
         if isinstance(self.tree, WorkingTree):
             # We currently have to hide the revision columns, because the
-            # revision property is not availible from the WorkingTree.inventory.
+            # revision property is not available from the WorkingTree.inventory.
             # We may be able to get this by looking at the revision tree for
             # the revision of the basis tree.
             header.hideSection(self.tree_model.DATE)
@@ -1525,7 +1525,7 @@
         """Causes a tree to be loaded, and displayed in the widget.
 
         @param changes_mode: If in changes mode, a list of changes, and
-                             unversioned items, rather than a tree, is diplayed.
+                             unversioned items, rather than a tree, is displayed.
                              e.g., when not in changes mode, one will get:
 
                              dir1
@@ -1578,7 +1578,7 @@
             # repainted when you scroll.
             # (https://bugs.launchpad.net/qbrz/+bug/402276)
             # I think that this is a bug with qt, and so this is just a work-
-            # arround. We should check when we bump the min qt version to 4.5 if
+            # around. We should check when we bump the min qt version to 4.5 if
             # we can take this out. I think it only happens on windows. This may
             # need to be checked.
             # RJLRJL: review this for the ignored / select all checkboxes which
@@ -1656,7 +1656,7 @@
             # Don't drag if we are not over the selection.
             self.setDragEnabled(False)
         else:
-            # Don't allow draging a selection that goes across dirs.
+            # Don't allow dragging a selection that goes across dirs.
             ok_selection = True
             item_by_path = {}
             item_ids = set()
@@ -1966,7 +1966,7 @@
                                auto_start_show_on_failed=True,
                                hide_progress=True,)
         # RJLRJL: Check that the comment below is warranted
-        # We don't refesh the tree, because it is very unlikley to have changed.
+        # We don't refresh the tree, because it is very unlikely to have changed.
 
     def resolve(self):
         """Mark selected file(s) as resolved."""

=== modified file 'lib/ui_run.py'
--- lib/ui_run.py	2021-01-06 11:42:36 +0000
+++ lib/ui_run.py	2024-11-17 08:32:35 +0000
@@ -109,7 +109,7 @@
         self.run_container.setTitle(_translate("RunDialog", "Options"))
         self.wd_label.setText(_translate("RunDialog", "&Working directory:"))
         self.browse_button.setText(_translate("RunDialog", "&Browse..."))
-        self.cat_label.setText(_translate("RunDialog", "C&ategory:"))
+        self.cat_label.setText(_translate("RunDialog", "C&category:"))
         self.cmd_label.setText(_translate("RunDialog", "&Command:"))
         self.hidden_checkbox.setText(_translate("RunDialog", "&Show hidden commands"))
         self.opt_arg_label.setText(_translate("RunDialog", "&Options and arguments for command:"))

=== modified file 'lib/uifactory.py'
--- lib/uifactory.py	2024-01-31 23:48:45 +0000
+++ lib/uifactory.py	2024-11-17 08:32:35 +0000
@@ -140,7 +140,7 @@
     
 
 # You can run this file to test the ui factory. This is not in the test suit
-# because it actualy open the ui, and so user interaction is required to run
+# because it actually open the ui, and so user interaction is required to run
 # the test.
 if __name__ == "__main__":
     application = QtWidgets.QApplication([])

=== modified file 'lib/util.py'
--- lib/util.py	2024-01-31 23:48:45 +0000
+++ lib/util.py	2024-11-17 08:32:35 +0000
@@ -866,7 +866,7 @@
 
     def __init__(self, parent):
         self.is_running = False
-        self.stoping = False
+        self.stopping = False
         self.parent = parent
         self.restart_timeout = None
 
@@ -890,16 +890,16 @@
     def start(self, timeout=0):
         if not self.is_running:
             self.is_running = True
-            self.stoping = False
+            self.stopping = False
             QtCore.QTimer.singleShot(timeout, self.run_wrapper)
 
     def stop(self):
-        self.stoping = True
+        self.stopping = True
 
     def processEvents(self, flags=QtCore.QEventLoop.AllEvents):
         self.parent.processEvents(flags)
-        if self.stoping:
-            self.stoping = False
+        if self.stopping:
+            self.stopping = False
             raise trace.StopException()
 
 
@@ -1110,7 +1110,7 @@
     # (no windows option as far as I am aware)
     # Maybe have our own config setting.
 
-    # Get the defaul font size
+    # Get the default font size
     size = QtWidgets.QApplication.font().pointSize()
 
     for font_family in ("Monospace", "Courier New"):

=== modified file 'lib/widgets/texteditaccessory.py'
--- lib/widgets/texteditaccessory.py	2024-01-31 23:48:45 +0000
+++ lib/widgets/texteditaccessory.py	2024-11-17 08:32:35 +0000
@@ -32,7 +32,7 @@
     :data:  marker positions, list of tuple (block index, num of blocks)
     :index: index of the column to render this entry.
             * Two or more groups can be rendered on same columns.
-            * If index == -1, the group is renderd on all columns.
+            * If index == -1, the group is rendered on all columns.
     """
     __slots__ = ['key', 'color', 'data', 'index']
 

=== modified file 'ui/run.ui'
--- ui/run.ui	2010-01-22 16:21:58 +0000
+++ ui/run.ui	2024-11-17 08:32:35 +0000
@@ -58,7 +58,7 @@
          <item row="0" column="0" >
           <widget class="QLabel" name="cat_label" >
            <property name="text" >
-            <string>C&amp;ategory:</string>
+            <string>C&amp;category:</string>
            </property>
            <property name="buddy" >
             <cstring>cmd_combobox</cstring>