diff --git a/gajim/adhoc_commands.py b/gajim/adhoc_commands.py
index af0e03a75..87e439712 100644
--- a/gajim/adhoc_commands.py
+++ b/gajim/adhoc_commands.py
@@ -478,7 +478,7 @@ class CommandWindow:
     def on_check_commands_2_button_clicked(self, widget):
         self.stage1()
 
-# stage 5: an error has occured
+# stage 5: an error has occurred
     def stage5(self, error=None, errorid=None, senderror=False):
         """
         Display the error message. Wait for user to close the window
diff --git a/gajim/advanced_configuration_window.py b/gajim/advanced_configuration_window.py
index cc56b37db..5440b84e2 100644
--- a/gajim/advanced_configuration_window.py
+++ b/gajim/advanced_configuration_window.py
@@ -134,7 +134,7 @@ class AdvancedConfigurationWindow(object):
 
     def cb_value_column_data(self, col, cell, model, iter_, data):
         """
-        Check if it's boolen or holds password stuff and if yes  make the
+        Check if it's boolean or holds password stuff and if yes  make the
         cellrenderertext not editable, else - it's editable
         """
         optname = model[iter_][Column.PREFERENCE_NAME]
diff --git a/gajim/chat_control.py b/gajim/chat_control.py
index f729ecdb7..9581e8eed 100644
--- a/gajim/chat_control.py
+++ b/gajim/chat_control.py
@@ -929,9 +929,9 @@ class ChatControl(ChatControlBase):
                 status and error is mainly that with error, msg count as a new message
                 (in systray and in control).
         If frm is set to info: it's a information message.
-        If frm is set to print_queue: it is incomming from queue.
+        If frm is set to print_queue: it is incoming from queue.
         If frm is set to another value: it's an outgoing message.
-        If frm is not set: it's an incomming message.
+        If frm is not set: it's an incoming message.
         """
         contact = self.contact
 
diff --git a/gajim/common/caps_cache.py b/gajim/common/caps_cache.py
index e96caacca..e26e19677 100644
--- a/gajim/common/caps_cache.py
+++ b/gajim/common/caps_cache.py
@@ -171,7 +171,7 @@ class AbstractClientCaps(object):
 
     def _discover(self, connection, jid):
         """
-        To be implemented by subclassess
+        To be implemented by subclasses
         """
         raise NotImplementedError
 
@@ -180,7 +180,7 @@ class AbstractClientCaps(object):
 
     def _lookup_in_cache(self, caps_cache):
         """
-        To be implemented by subclassess
+        To be implemented by subclasses
         """
         raise NotImplementedError
 
@@ -189,7 +189,7 @@ class AbstractClientCaps(object):
 
     def _is_hash_valid(self, identities, features, dataforms):
         """
-        To be implemented by subclassess
+        To be implemented by subclasses
         """
         raise NotImplementedError
 
@@ -217,7 +217,7 @@ class ClientCaps(AbstractClientCaps):
 
 class OldClientCaps(AbstractClientCaps):
     """
-    Old XEP-115 implemtation. Kept around for background competability
+    Old XEP-115 implementation. Kept around for background compatibility
     """
     def __init__(self, caps_hash, node):
         AbstractClientCaps.__init__(self, caps_hash, node)
@@ -453,7 +453,7 @@ class MucCapsCache:
                     data.append(dataforms.ExtendForm(node=child))
 
         if nbxmpp.NS_MUC not in features:
-            # Not a MUC, dont cache info
+            # Not a MUC, don't cache info
             return
 
         self.cache[jid] = self.DiscoInfo(identities, features, data)
diff --git a/gajim/common/contacts.py b/gajim/common/contacts.py
index 8693c94a8..9eed0be86 100644
--- a/gajim/common/contacts.py
+++ b/gajim/common/contacts.py
@@ -475,7 +475,7 @@ class Contacts():
         contacts = self._contacts[contact.jid]
         # We had only one that was offline, remove it
         if len(contacts) == 1 and contacts[0].show == 'offline':
-            # Do not use self.remove_contact: it deteles
+            # Do not use self.remove_contact: it deletes
             # self._contacts[account][contact.jid]
             contacts.remove(contacts[0])
         # If same JID with same resource already exists, use the new one
@@ -868,7 +868,7 @@ class MetacontactManager():
 
     def _get_metacontacts_big_brother(self, family):
         """
-        Which of the family will be the big brother under wich all others will be
+        Which of the family will be the big brother under which all others will be
         ?
         """
         return max(family, key=self._metacontact_key)
diff --git a/gajim/config.py b/gajim/config.py
index 6daf35db3..df6d0f9de 100644
--- a/gajim/config.py
+++ b/gajim/config.py
@@ -531,7 +531,7 @@ class PreferencesWindow:
         returns "mixed"
         """
         if len(app.connections) == 0:
-            # a non existant key return default value
+            # a non existent key return default value
             return app.config.get_per('accounts', '__default__', opt)
         val = None
         for account in app.connections:
@@ -2025,7 +2025,7 @@ class ManageBookmarksWindow:
 
     def check_valid_bookmark(self):
         """
-        Check if all neccessary fields are entered correctly
+        Check if all necessary fields are entered correctly
         """
         (model, iter_) = self.selection.get_selected()
 
diff --git a/gajim/conversation_textview.py b/gajim/conversation_textview.py
index d56fe2682..b0f7c6829 100644
--- a/gajim/conversation_textview.py
+++ b/gajim/conversation_textview.py
@@ -184,7 +184,7 @@ class ConversationTextview(GObject.GObject):
         # no need to inherit TextView, use it as atrribute is safer
         self.tv = HtmlTextView()
         # we have to override HtmlTextView Event handlers
-        # because we dont inherit
+        # because we don't inherit
         self.tv.hyperlink_handler = self.hyperlink_handler
         self.tv.connect_tooltip(self.query_tooltip)
 
@@ -391,7 +391,7 @@ class ConversationTextview(GObject.GObject):
             allowed = False
 
         if not allowed:
-            log.debug('Message correctiong not allowed')
+            log.debug('Message correction not allowed')
             return None
 
         end_mark, index = self.get_end_mark(correct_id, start_mark)
@@ -619,9 +619,9 @@ class ConversationTextview(GObject.GObject):
         self.emit('quote', self.selected_phrase)
 
     def on_textview_button_press_event(self, widget, event):
-        # If we clicked on a taged text do NOT open the standard popup menu
+        # If we clicked on a tagged text do NOT open the standard popup menu
         # if normal text check if we have sth selected
-        self.selected_phrase = '' # do not move belove event button check!
+        self.selected_phrase = '' # do not move below event button check!
 
         if event.button != 3: # if not right click
             return False
@@ -744,7 +744,7 @@ class ConversationTextview(GObject.GObject):
     def hyperlink_handler(self, texttag, widget, event, iter_, kind):
         if event.type == Gdk.EventType.BUTTON_PRESS:
             begin_iter = iter_.copy()
-            # we get the begining of the tag
+            # we get the beginning of the tag
             while not begin_iter.begins_tag(texttag):
                 begin_iter.backward_char()
             end_iter = iter_.copy()
diff --git a/gajim/dataforms_widget.py b/gajim/dataforms_widget.py
index e5ddf4002..ba7cf20ef 100644
--- a/gajim/dataforms_widget.py
+++ b/gajim/dataforms_widget.py
@@ -20,7 +20,7 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-''' This module contains widget that can display data form (JEP-0004).
+''' This module contains widget that can display data form (XEP-0004).
 Words single and multiple refers here to types of data forms:
 single means these with one record of data (without <reported/> element),
 multiple - these which may contain more data (with <reported/> element).'''
diff --git a/gajim/dev/ipython_view.py b/gajim/dev/ipython_view.py
index 835a782f5..2fb86f97d 100644
--- a/gajim/dev/ipython_view.py
+++ b/gajim/dev/ipython_view.py
@@ -303,7 +303,7 @@ class IterableIPShell:
 
     def complete(self, line):
         """
-        Returns an auto completed line and/or posibilities for completion
+        Returns an auto completed line and/or possibilities for completion
 
         @param line: Given line so far.
         @type line: string
@@ -537,10 +537,10 @@ class ConsoleView(Gtk.TextView):
     def onKeyPress(self, widget, event):
         """
         Key press callback used for correcting behavior for console-like
-        interfaces. For example 'home' should go to prompt, not to begining of
+        interfaces. For example 'home' should go to prompt, not to beginning of
         line
 
-        @param widget: Widget that key press accored in.
+        @param widget: Widget that key press occurred in.
         @type widget: Gtk.Widget
         @param event: Event object
         @type event: Gdk.Event
@@ -617,7 +617,7 @@ class IPythonView(ConsoleView, IterableIPShell):
         """
         Custom raw_input() replacement. Get's current line from console buffer
 
-        @param prompt: Prompt to print. Here for compatability as replacement.
+        @param prompt: Prompt to print. Here for compatibility as replacement.
         @type prompt: string
 
         @return: The current command line text.
@@ -633,7 +633,7 @@ class IPythonView(ConsoleView, IterableIPShell):
         Key press callback with plenty of shell goodness, like history,
         autocompletions, etc
 
-        @param widget: Widget that key press occured in.
+        @param widget: Widget that key press occurred in.
         @type widget: Gtk.Widget
         @param event: Event object.
         @type event: Gdk.Event
diff --git a/gajim/dialog_messages.py b/gajim/dialog_messages.py
index e726e5ed2..ffa5eff15 100644
--- a/gajim/dialog_messages.py
+++ b/gajim/dialog_messages.py
@@ -170,7 +170,7 @@ messages = {
 
     'httpupload-encryption-not-available': Message(
         _('Encryption Error'),
-        _('For the choosen encryption there is no encryption method available'),
+        _('For the chosen encryption there is no encryption method available'),
         ErrorDialog),
 
     'avatar-upload-error': Message(
diff --git a/gajim/disco.py b/gajim/disco.py
index a084286a4..898eb92c0 100644
--- a/gajim/disco.py
+++ b/gajim/disco.py
@@ -362,7 +362,7 @@ class ServicesCache:
         # NS_BROWSE is deprecated, but we check for it anyways.
         # Some services list it in features and respond to
         # NS_DISCO_ITEMS anyways.
-        # Allow browsing for unknown types aswell.
+        # Allow browsing for unknown types as well.
         if (not features and not identities) or \
         nbxmpp.NS_DISCO_ITEMS in features or nbxmpp.NS_BROWSE in features:
             return ToplevelAgentBrowser
@@ -1217,7 +1217,7 @@ class ToplevelAgentBrowser(AgentBrowser):
                 # fetching or error
                 cell.set_property('foreground_set', True)
             else:
-                # Normal/succes
+                # Normal/success
                 cell.set_property('foreground_set', False)
         else:
             theme = app.config.get('roster_theme')
diff --git a/gajim/filetransfers_window.py b/gajim/filetransfers_window.py
index 11744c758..530971430 100644
--- a/gajim/filetransfers_window.py
+++ b/gajim/filetransfers_window.py
@@ -898,13 +898,13 @@ class FileTransfersWindow:
 
     def on_file_transfers_dialog_delete_event(self, widget, event):
         self.window.hide()
-        return True # do NOT destory window
+        return True # do NOT destroy window
 
     def on_close_button_clicked(self, widget):
         self.window.hide()
 
     def show_context_menu(self, event, iter_):
-        # change the sensitive propery of the buttons and menuitems
+        # change the sensitive property of the buttons and menuitems
         if iter_:
             path = self.model.get_path(iter_)
             self.set_buttons_sensitive(path, True)
diff --git a/gajim/gajim_remote.py b/gajim/gajim_remote.py
index 3b6015b8f..d92bd7223 100644
--- a/gajim/gajim_remote.py
+++ b/gajim/gajim_remote.py
@@ -333,7 +333,7 @@ class GajimRemote:
 
     def init_connection(self):
         """
-        Create the onnection to the session dbus, or exit if it is not possible
+        Create the connection to the session dbus, or exit if it is not possible
         """
         try:
             self.sbus = dbus.SessionBus()
@@ -397,7 +397,7 @@ class GajimRemote:
 
     def print_info(self, level, prop_dict, encode_return = False):
         """
-        Return formated string from data structure
+        Return formatted string from data structure
         """
         if prop_dict is None or not isinstance(prop_dict, (dict, list, tuple)):
             return ''
diff --git a/gajim/gajim_themes_window.py b/gajim/gajim_themes_window.py
index 0ea5490a8..4dfe3909b 100644
--- a/gajim/gajim_themes_window.py
+++ b/gajim/gajim_themes_window.py
@@ -217,7 +217,7 @@ class GajimThemesWindow:
         self.background_checkbutton.set_active(state)
         self.background_colorbutton.set_sensitive(state)
 
-        # get the font name before we set widgets and it will not be overriden
+        # get the font name before we set widgets and it will not be overridden
         font_name = app.config.get_per('themes', theme, option + 'font')
         font_attrs = app.config.get_per('themes', theme, option + 'fontattrs')
         self._set_font_widgets(font_attrs)
diff --git a/gajim/groupchat_control.py b/gajim/groupchat_control.py
index 982526cf5..1761ef5d9 100644
--- a/gajim/groupchat_control.py
+++ b/gajim/groupchat_control.py
@@ -836,7 +836,7 @@ class GroupchatControl(ChatControlBase):
             if rend[0] not in ('avatar', 'icon'):
                 col.add_attribute(rend[1], rend[3], rend[4])
             col.set_cell_data_func(rend[1], rend[5], rend[6])
-        # set renderers propertys
+        # set renderers properties
         for renderer in self.renderers_propertys.keys():
             renderer.set_property(self.renderers_propertys[renderer][0],
                 self.renderers_propertys[renderer][1])
diff --git a/gajim/gui_interface.py b/gajim/gui_interface.py
index 20f53df34..a02039cf7 100644
--- a/gajim/gui_interface.py
+++ b/gajim/gui_interface.py
@@ -824,7 +824,7 @@ class Interface:
     def handle_event_bookmarks(self, obj):
         # ('BOOKMARKS', account, [{name,jid,autojoin,password,nick}, {}])
         # We received a bookmark item from the server (JEP48)
-        # Auto join GC windows if neccessary
+        # Auto join GC windows if necessary
 
         gui_menu_builder.build_bookmark_menu(obj.conn.name)
         invisible_show = app.SHOW_LIST.index('invisible')
@@ -1204,7 +1204,7 @@ class Interface:
 
         proposed_resource = conn.server_resource
         if proposed_resource.startswith('gajim.'):
-            # Dont notify the user about resource change if he didnt set
+            # Dont notify the user about resource change if he didn't set
             # a custom resource
             on_ok('gajim.$rand')
             return
diff --git a/gajim/history_sync.py b/gajim/history_sync.py
index 708961597..102b431eb 100644
--- a/gajim/history_sync.py
+++ b/gajim/history_sync.py
@@ -287,7 +287,7 @@ class SummaryPage(Gtk.Box):
     def finished(self):
         received = self.assistant.download_history.received
         finished = _('''
-        Finshed synchronising your History.
+        Finished synchronising your History.
         {received} Messages downloaded.
         '''.format(received=received))
         self.label.set_text(finished)
diff --git a/gajim/history_window.py b/gajim/history_window.py
index f661454dc..3e68bd389 100644
--- a/gajim/history_window.py
+++ b/gajim/history_window.py
@@ -196,7 +196,7 @@ class HistoryWindow:
                 info_completion = info_name
                 info_jid = contact.jid
             else:
-                # Corrensponding account is offline, we know nothing
+                # Corresponding account is offline, we know nothing
                 info_name = completed.split('@')[0]
                 info_completion = completed
                 info_jid = completed
diff --git a/gajim/htmltextview.py b/gajim/htmltextview.py
index d7756130a..3332f7b13 100644
--- a/gajim/htmltextview.py
+++ b/gajim/htmltextview.py
@@ -184,9 +184,9 @@ LIST_ELEMS = set( 'dl, ol, ul'.split(', '))
 for name in BLOCK_HEAD:
     num = eval(name[1])
     header_size = (num-1) // 2
-    weigth = (num - 1) % 2
+    weight = (num - 1) % 2
     element_styles[name] = '; font-size: %s; %s' % ( ('large', 'medium', 'small')[header_size],
-        ('font-weight: bold', 'font-style: oblique')[weigth],)
+        ('font-weight: bold', 'font-style: oblique')[weight],)
 
 def _parse_css_color(color):
     if color.startswith('rgb(') and color.endswith(')'):
@@ -970,7 +970,7 @@ class HtmlTextView(Gtk.TextView):
     def hyperlink_handler(self, texttag, widget, event, iter_, kind):
         if event.type == Gdk.EventType.BUTTON_PRESS:
             begin_iter = iter_.copy()
-            # we get the begining of the tag
+            # we get the beginning of the tag
             while not begin_iter.begins_tag(texttag):
                 begin_iter.backward_char()
             end_iter = iter_.copy()
@@ -1084,7 +1084,7 @@ if __name__ == '__main__':
     from gajim.conversation_textview import ConversationTextview
     from gajim.gui_interface import Interface
     from gajim.common import app, logger, caps_cache
-    # TODO: dont call Logger() it will create the DB
+    # TODO: don't call Logger() it will create the DB
     # maybe mock this object for tests
     # app.logger = logger.Logger()
     # caps_cache.initialize(app.logger)
diff --git a/gajim/logind_listener.py b/gajim/logind_listener.py
index ccb9d9d3a..6499fa452 100644
--- a/gajim/logind_listener.py
+++ b/gajim/logind_listener.py
@@ -67,7 +67,7 @@ def signal_received(connection, sender_name, object_path,
         # something is wrong, the system is suspending but we don't have
         # a lock file
         log.warning("System suspend detected, but we don't seem to be holding "
-                    "a file descriptor for sleep inihibitor")
+                    "a file descriptor for sleep inhibitor")
 
 
 def get_inhibitor(connection):
@@ -76,7 +76,7 @@ def get_inhibitor(connection):
     global fd
 
     if fd is not None:
-        # someting is wrong, we haven't closed the previous file descriptor
+        # something is wrong, we haven't closed the previous file descriptor
         # and we ask for yet another one
         log.warning('We are about to ask for a sleep inhibitor, but we seem '
                     'to be holding one already')
diff --git a/gajim/message_control.py b/gajim/message_control.py
index 26c0b52a7..812bdd7cd 100644
--- a/gajim/message_control.py
+++ b/gajim/message_control.py
@@ -94,7 +94,7 @@ class MessageControl(object):
 
     def safe_shutdown(self):
         """
-        Called to check if control can be closed without loosing data.
+        Called to check if control can be closed without losing data.
         returns True if control can be closed safely else False
 
         Derived classes MAY implement this.
diff --git a/gajim/message_window.py b/gajim/message_window.py
index 409ba5915..e91882f75 100644
--- a/gajim/message_window.py
+++ b/gajim/message_window.py
@@ -71,7 +71,7 @@ class MessageWindow(object):
         # If None, the window is not tied to any specific type
         self.type_ = type_
         # dict { handler id: widget}. Keeps callbacks, which
-        # lead to cylcular references
+        # lead to circular references
         self.handlers = {}
         # Don't show warning dialogs when we want to delete the window
         self.dont_warn_on_delete = False
@@ -398,7 +398,7 @@ class MessageWindow(object):
                 self.remove_tab(control, self.CLOSE_CTRL_KEY)
                 return True
             elif keyval == Gdk.KEY_w: # CTRL + w
-                # CTRL + w removes latest word before sursor when User uses emacs
+                # CTRL + w removes latest word before cursor when User uses emacs
                 # theme
                 if not Gtk.Settings.get_default().get_property(
                 'gtk-key-theme-name') == 'Emacs':
diff --git a/gajim/remote_control.py b/gajim/remote_control.py
index 5c763e1bb..da27f147c 100644
--- a/gajim/remote_control.py
+++ b/gajim/remote_control.py
@@ -506,7 +506,7 @@ class SignalObject(dbus.service.Object):
                 elif first_connected_acct is None:
                     first_connected_acct = acct
 
-        # if jid is not a conntact, open-chat with first connected account
+        # if jid is not a contact, open-chat with first connected account
         if connected_account is None and first_connected_acct:
             connected_account = first_connected_acct
 
diff --git a/gajim/roster_window.py b/gajim/roster_window.py
index b4fdc6599..8ed41f184 100644
--- a/gajim/roster_window.py
+++ b/gajim/roster_window.py
@@ -553,7 +553,7 @@ class RosterWindow:
                 family, account)[0]
 
         # Family might has changed (actual big brother not on top).
-        # Remove childs first then big brother
+        # Remove children first then big brother
         family_in_roster = False
         for data in nearby_family:
             _account = data['account']
@@ -786,7 +786,7 @@ class RosterWindow:
                 # Remove contact before redrawing, otherwise the old
                 # numbers will still be show
                 if not maximize:
-                    # Dont remove contact when we maximize a room
+                    # Don't remove contact when we maximize a room
                     app.contacts.remove_jid(account, jid, remove_meta=True)
                 if iters:
                     rest_of_family = [data for data in family
@@ -1006,10 +1006,10 @@ class RosterWindow:
             app.to_be_removed[account].remove(jid)
             family = app.contacts.get_metacontacts_family(account, jid)
             if family:
-                # Peform delayed recalibration
+                # Perform delayed recalibration
                 self._recalibrate_metacontact_family(family, account)
             self.draw_contact(jid, account)
-            # Hide Group if all childs are hidden
+            # Hide Group if all children are hidden
             contact = app.contacts.get_contact(account, jid)
             if not contact:
                 return
@@ -1242,7 +1242,7 @@ class RosterWindow:
                 status = helpers.reduce_chars_newlines(status,
                     max_lines = 1)
                 # escape markup entities and make them small
-                # italic and fg color color is calcuted to be
+                # italic and fg color color is calculated to be
                 # always readable
                 color = gtkgui_helpers.get_fade_color(self.tree, selected,
                     focus)
@@ -1811,7 +1811,7 @@ class RosterWindow:
 
 ################################################################################
 ### FIXME: Methods that don't belong to roster window...
-###             ... atleast not in there current form
+###             ... at least not in there current form
 ################################################################################
 
     def fire_up_unread_messages_events(self, account):
@@ -1846,7 +1846,7 @@ class RosterWindow:
         """
         Fill app.contacts and app.groups
         """
-        # FIXME: This function needs to be splitted
+        # FIXME: This function needs to be split
         # Most of the logic SHOULD NOT be done at GUI level
         if account not in app.contacts.get_accounts():
             app.contacts.add_account(account)
@@ -3004,7 +3004,7 @@ class RosterWindow:
 
     def on_disconnect(self, widget, jid, account):
         """
-        When disconnect menuitem is activated: disconect from room
+        When disconnect menuitem is activated: disconnect from room
         """
         if jid in app.interface.minimized_controls[account]:
             ctrl = app.interface.minimized_controls[account][jid]
@@ -4165,7 +4165,7 @@ class RosterWindow:
                 # We have got little brothers. Readd them all
                 self._remove_metacontact_family(old_family, account_source)
             else:
-                # We are only a litle brother. Simply remove us from our big
+                # We are only a little brother. Simply remove us from our big
                 # brother
                 if self._get_contact_iter(c_source.jid, account_source):
                     # When we have been in the group before.
@@ -4294,7 +4294,7 @@ class RosterWindow:
             return
         data = selection.get_data().decode()
         if not data:
-            return # prevents tb when several entrys are dragged
+            return # prevents tb when several entries are dragged
         model = treeview.get_model()
 
         path_dest, position = drop_info
@@ -5419,7 +5419,7 @@ class RosterWindow:
 
     def add_history_manager_menuitem(self, menu):
         """
-        Add a seperator and History Manager menuitem BELOW for account menuitems
+        Add a separator and History Manager menuitem BELOW for account menuitems
         """
         item = Gtk.SeparatorMenuItem.new() # separator
         menu.append(item)
@@ -5518,7 +5518,7 @@ class RosterWindow:
             if rend[0] != 'avatar':
                 col.add_attribute(rend[1], rend[3], rend[4])
             col.set_cell_data_func(rend[1], rend[5], rend[6])
-        # set renderers propertys
+        # set renderers properties
         for renderer in self.renderers_propertys.keys():
             renderer.set_property(self.renderers_propertys[renderer][0],
                 self.renderers_propertys[renderer][1])
@@ -5660,7 +5660,7 @@ class RosterWindow:
         # no need of this variable
         self.have_new_chat_accel = False # Is the "Ctrl+N" shown ?
         self.regroup = app.config.get('mergeaccounts')
-        self.clicked_path = None # Used remember on wich row we clicked
+        self.clicked_path = None # Used remember on which row we clicked
         if len(app.connections) < 2:
             # Do not merge accounts if only one exists
             self.regroup = False
@@ -5805,7 +5805,7 @@ class RosterWindow:
         self.tree.set_tooltip_window(tooltips.RosterTooltip(self.window))
         self.current_tooltip = None
         self.tree.connect('query-tooltip', self.query_tooltip)
-        # Workaroung: For strange reasons signal is behaving like row-changed
+        # Workaround: For strange reasons signal is behaving like row-changed
         self._toggeling_row = False
         self.setup_and_draw_roster()