Various typo fixes

NEWS

@@ -157,7 +157,7 @@
    * Move application icons into the resource bundle (Vasily Galkin)
    * Improved error reporting for invalid change actions (Anatoli Babenia)
    * Fix too-large minimum window size from status bar buttons (Kai Willadsen)
-   * Fix Subversion comparsion on Python 3.9 (Kai Willadsen)
+   * Fix Subversion comparison on Python 3.9 (Kai Willadsen)
    * Fix bad translation source strings with multiple arguments (Kai Willadsen)
    * Fix performance regression in file comparison line splitting logic (Kai
      Willadsen)
@@ -510,7 +510,7 @@
    * Make multiple --diff command line options work again (Kai Willadsen)
    * Fix committing selected files in Mercurial (Kai Willadsen)
    * Fix Bazaar support for our Python 3 port (Kai Willadsen)
-   * Avoid a race conditon that made the "Resolve conflict" prompt unreliable
+   * Avoid a race condition that made the "Resolve conflict" prompt unreliable
      (Kai Willadsen)
    * Fix invalid-iter crash when refreshing version control view (Kai
      Willadsen)
@@ -806,7 +806,7 @@
    * Port to use GtkSourceView's file loader and saver helpers, bringing
      several benefits (Kai Willadsen)
      * Loading and saving speed are significantly improved, and are
-       asychronous
+       asynchronous
      * We try a wider range of locale-specific file encodings by default,
        and still support user-specified default encodings (requires
        GtkSourceView 3.18 or later)
@@ -1044,7 +1044,7 @@
 
    * Folder comparisons will now show an identical notification similar to the
      one used in file comparison (Kai Willadsen)
-   * The "New blank comparion" button now works for folder comparisons as well
+   * The "New blank comparison" button now works for folder comparisons as well
      as file ones (Kai Willadsen)
    * In folder comparisons, the expansion state of the tree is now remembered
      when you collapse and re-expand a row (Kai Willadsen)
@@ -1660,7 +1660,7 @@
 
     * Slightly faster diff calculation (Piotr Piastucki)
     * Avoid too-tall commit dialogues (Nguyễn Hồng Quân)
-    * Minor bug fixes and performance improvments (Kai Willadsen)
+    * Minor bug fixes and performance improvements (Kai Willadsen)
 
   Translation updates:
 
@@ -1691,7 +1691,7 @@
       of the same type if we can't determine otherwise (Kai Willadsen)
     * Some fixes to colour usage and legibility for dark themes, with more
       theme fixes coming soon (Kai Willadsen)
-    * Remember active filters across sessions in directory and VC comparions
+    * Remember active filters across sessions in directory and VC comparisons
       (Kai Willadsen)
     * Guess which version control system a user is most likely to want to see,
       in the event of multiple VCs in a single working copy (Kai Willadsen)
@@ -1968,7 +1968,7 @@
 2007-06-09 meld-1.1.5
 =====================
 
-	* Handle new version contol command line arguments.
+	* Handle new version control command line arguments.
 
 	* CLI option to set the tab labels. Bug 138860.
 
@@ -2128,7 +2128,7 @@
 	* New status bar shows permissions and dates in dirdiff, shows
 	  line/column in filediff.
 
-	* Better focus behaviour when switching betweeen tabs.
+	* Better focus behaviour when switching between tabs.
 
 	* Works with pygtk-2.3.92
 
@@ -2350,7 +2350,7 @@
 
 	* cvsview: Hide location when not in recurse mode.
 
-	* cvsview: Commit messages now work when containing shell metacharaters.
+	* cvsview: Commit messages now work when containing shell metacharacters.
 
 	* filediff: Load files lazily for quicker feedback
 

meld/iohelpers.py

@@ -222,7 +222,7 @@ def format_parent_relative_path(parent: Gio.File, descendant: Gio.File) -> str:
 
         # As an additional heuristic, we try to include the second-last
         # path segment as well, to handle paths like e.g.,
-        # <parent>/<some packge structure>/<module>/src/main.py.
+        # <parent>/<some package structure>/<module>/src/main.py.
         # We only do this if the last component is short, to
         # handle src, dist, pkg, etc. without using too much space.
         if len(relative_path.parts) > 2 and len(immediate_parent_strs[0]) < 5:

test/dirdiff/test_files_same.py

@@ -38,11 +38,11 @@ def abspath(*args):
     ((), [], cmp_args, DiffResult.Same),
     # dirs are same
     (('diffs/a', 'diffs/b'), [], cmp_args, DiffResult.Same),
-    # dir and file ar diffent
+    # dir and file are different
     (('diffs/a', 'diffs/b/b.txt'), [], cmp_args, DiffResult.Different),
     # shallow equal (time + size)
     (('diffs/a/d/d.txt', 'diffs/b/d/d.1.txt'), [], dodgy_args, DiffResult.DodgySame),
-    # empty files (fastest equal, wont read files)
+    # empty files (fastest equal, won't read files)
     (('diffs/a/c/c.txt', 'diffs/b/c/c.txt'), [], cmp_args, DiffResult.Same),
     # 4.1kb vs 4.1kb file (slow equal, read both until end)
     (('diffs/a/d/d.txt', 'diffs/b/d/d.txt'), [], cmp_args, DiffResult.Same),