diff --git a/bin/meld b/bin/meld
index 778549dc835f130d98d04049a22ae60f89e73c42..1279dc4699fac9c4a98174e855e24e1adc815eb0 100755
--- a/bin/meld
+++ b/bin/meld
@@ -161,7 +161,7 @@ def show_error_and_exit(error_text):
).run()
except Exception:
# Although tkinter is imported here, it isn't meld's dependency:
- # if found it is used to show GUI error about lacking true dependecies.
+ # if found it is used to show GUI error about lacking true dependencies.
try:
if sys.version_info < (3, 0):
from Tkinter import Tk
diff --git a/data/org.gnome.meld.gschema.xml b/data/org.gnome.meld.gschema.xml
index b91b69f15cfd286cb1d33349ba5f350f3e92237b..d966b43ba9ea7bfc33cd645987fc7f8c45eb68b2 100644
--- a/data/org.gnome.meld.gschema.xml
+++ b/data/org.gnome.meld.gschema.xml
@@ -153,7 +153,7 @@
The command used to launch a custom editor. Some limited templating is supported here; at the moment '{file}' and '{line}' are recognised tokens.
-
+
[("size", true), ("modification time", true), ("permissions", false)]
Columns to display
diff --git a/meld/ui/bufferselectors.py b/meld/ui/bufferselectors.py
index fc93b6231b89cd4d1d39423ddcc0e721d698f148..03c5c1c960cf9a9d235ee5696efffc3bcd0bfe82 100644
--- a/meld/ui/bufferselectors.py
+++ b/meld/ui/bufferselectors.py
@@ -13,7 +13,7 @@ from meld.conf import _
class FilteredListSelector:
- # FilteredListSelector was intially based on gedit's
+ # FilteredListSelector was initially based on gedit's
# GeditHighlightModeSelector
# Copyright (C) 2013 - Ignacio Casal Quinteiro
# Python translation and adaptations
@@ -113,7 +113,7 @@ class EncodingSelector(FilteredListSelector, Gtk.Grid):
name=enc.get_name(), charset=enc.get_charset())
-# SourceLangSelector was intially based on gedit's
+# SourceLangSelector was initially based on gedit's
# GeditHighlightModeSelector
# Copyright (C) 2013 - Ignacio Casal Quinteiro
# Python translation and adaptations
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index d592e8ea31cc9f6e553a22164a178d83b8ddd894..f26828f5e579667c04cea9382f99ed7cdab48444 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -183,7 +183,7 @@ class Vc:
version control system has a (possibly partial) pre-filled
message, or None if no such message exists.
- This method should use pre-filled commit messages whereever
+ This method should use pre-filled commit messages wherever
provided by the version control system, most commonly these are
given in merging, revert or cherry-picking scenarios.
"""
@@ -326,7 +326,7 @@ class Vc:
except GLib.Error as e:
if e.domain != 'g-io-error-quark':
raise
- # Handling for non-existant files (or other IO errors)
+ # Handling for non-existent files (or other IO errors)
name = path
isdir = False
diff --git a/meld/vc/svn.py b/meld/vc/svn.py
index 8b9e58be7d7e05ca91cb830cfbcf27d03d8787aa..7af7f19814185f8cd190abd813fb7af8ad7bb77d 100644
--- a/meld/vc/svn.py
+++ b/meld/vc/svn.py
@@ -89,7 +89,7 @@ class Vc(_vc.Vc):
SVN has two types of conflicts:
Merge conflicts, which give 3 files:
.left.r* (THIS)
- .working (BASE... although this is a bit debateable)
+ .working (BASE... although this is a bit debatable)
.right.r* (OTHER)
Update conflicts which give 3 files:
.mine (THIS)
diff --git a/setup_win32.py b/setup_win32.py
index 5160edc3a88e39b5fe2b1c5481eed5933351ba17..0799d450d327048638a03f1e5fa39e2838730c08 100755
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -119,7 +119,7 @@ executable_options = {
if 'mingw' in sysconfig.get_platform():
executable_options.update({
- "base": "Win32GUI", # comment to build cosole version to see stderr
+ "base": "Win32GUI", # comment to build console version to see stderr
"targetName": "Meld.exe",
"shortcutName": "Meld",
"shortcutDir": "ProgramMenuFolder",