From fbe3fb63cec551cc16172e2b88e4d83aeea1cafd Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Mon, 11 Jan 2016 22:03:57 +0100
Subject: Fix various typos pointed by pabs

---
 CHANGELOG                 | 2 +-
 RELEASE                   | 2 +-
 libmat/bencode/bencode.py | 4 ++--
 libmat/mutagenstripper.py | 2 +-
 libmat/parser.py          | 4 ++--
 mat-gui                   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3b81e0c..b5ed04b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -46,7 +46,7 @@
     * Heavily refactoring of archives handling
     * Handle read-only files inside archives
     * Handle zip-specific metadata
-    * GUI allows to pick which unsupported files to add to the "clean" archive
+    * GUI allows one to pick which unsupported files to add to the "clean" archive
 
 0.4.2 - 31oct2013
     * Fix (for real this time) MAT eating PDF
diff --git a/RELEASE b/RELEASE
index b99dc16..a7955fe 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,6 +1,6 @@
 check if year in the copyright notice in README.md needs an update.
 
-mark "Fix commited" tickes as "resolved" in the bugtracker.
+mark "Fix committed" tickets as "resolved" in the bugtracker.
 
 update localisations using
     xgettext -k_ -kN_ --from-code utf-8 -o ./po/mat-gui.pot mat-gui.py ./data/mat.glade
diff --git a/libmat/bencode/bencode.py b/libmat/bencode/bencode.py
index a7967fc..afbd360 100644
--- a/libmat/bencode/bencode.py
+++ b/libmat/bencode/bencode.py
@@ -134,9 +134,9 @@ def bencode(string):
 def bdecode(string):
     """decode $string"""
     try:
-        result, lenght = DECODE_FUNC[string[0]](string, 0)
+        result, length = DECODE_FUNC[string[0]](string, 0)
     except (IndexError, KeyError, ValueError):
         raise BTFailure('Not a valid bencoded string')
-    if lenght != len(string):
+    if length != len(string):
         raise BTFailure('Invalid bencoded value (data after valid prefix)')
     return result
diff --git a/libmat/mutagenstripper.py b/libmat/mutagenstripper.py
index e7f2a96..10831b3 100644
--- a/libmat/mutagenstripper.py
+++ b/libmat/mutagenstripper.py
@@ -16,7 +16,7 @@ class MutagenStripper(parser.GenericParser):
         self._create_mfile()
 
     def _create_mfile(self):
-        """ This method must be overrriden to instanciate the `mfile` attribute."""
+        """ This method must be overridden to instantiate the `mfile` attribute."""
         raise NotImplementedError
 
     def is_clean(self):
diff --git a/libmat/parser.py b/libmat/parser.py
index 2a82a25..b81b576 100644
--- a/libmat/parser.py
+++ b/libmat/parser.py
@@ -12,8 +12,8 @@ NOMETA = frozenset((
     '.bmp',   # "raw" image
     '.rdf',   # text
     '.txt',   # plain text
-    '.xml',   # formated text (XML)
-    '.rels',  # openXML formated text
+    '.xml',   # formatted text (XML)
+    '.rels',  # openXML formatted text
 ))
 
 FIELD = object()
diff --git a/mat-gui b/mat-gui
index cedc099..f8ad92f 100755
--- a/mat-gui
+++ b/mat-gui
@@ -183,7 +183,7 @@ class GUI(object):
         w = Gtk.AboutDialog()
         w.set_authors(['Julien (jvoisin) Voisin', ])
         w.set_artists(['Marine Benoît', ])
-        w.set_copyright('GNU Public License v2')
+        w.set_copyright('GNU General Public License v2')
         w.set_comments(_('Trash your meta, keep your data'))
         w.set_logo(GdkPixbuf.Pixbuf.new_from_file_at_size(self.logo, 400, 200))
         w.set_program_name('Metadata Anonymisation Toolkit')
-- 
cgit v1.3