diff --git a/gajim/adhoc_commands.py b/gajim/adhoc_commands.py index 0b9a1fd94..cc855e9f5 100644 --- a/gajim/adhoc_commands.py +++ b/gajim/adhoc_commands.py @@ -550,7 +550,7 @@ class CommandWindow: progressbar.pulse() return True # important to keep callback be called back! - # 12 times per second (80 miliseconds) + # 12 times per second (80 milliseconds) self.pulse_id = GLib.timeout_add(80, callback) def remove_pulsing(self): diff --git a/gajim/config.py b/gajim/config.py index eff5ef1cb..571064263 100644 --- a/gajim/config.py +++ b/gajim/config.py @@ -1893,7 +1893,7 @@ class ManageBookmarksWindow: self.ignore_events = False - # Account-JID, RoomName, Room-JID, Autojoin, Minimize, Passowrd, Nick, + # Account-JID, RoomName, Room-JID, Autojoin, Minimize, Password, Nick, # Show_Status self.treestore = Gtk.TreeStore(str, str, str, bool, bool, str, str, str) self.treestore.set_sort_column_id(1, Gtk.SortType.ASCENDING) diff --git a/gajim/disco.py b/gajim/disco.py index 423eb5c4e..bfd5020ba 100644 --- a/gajim/disco.py +++ b/gajim/disco.py @@ -211,7 +211,7 @@ class Closure(object): """ A weak reference to a callback with arguments as an object - Weak references to methods immediatly die, even if the object is still + Weak references to methods immediately die, even if the object is still alive. Besides a handy way to store a callback, this provides a workaround that keeps a reference to the object instead. @@ -1248,7 +1248,7 @@ class ToplevelAgentBrowser(AgentBrowser): def _create_treemodel(self): # JID, node, icon, description, state - # state is None on sucess or has a string + # state is None on success or has a string # from LABELS on error or while fetching view = self.window.services_treeview self.model = Gtk.TreeStore(str, str, GdkPixbuf.Pixbuf, str, str) @@ -1441,7 +1441,7 @@ class ToplevelAgentBrowser(AgentBrowser): self.execute_button.set_sensitive(True) if self.search_button and nbxmpp.NS_SEARCH in features: self.search_button.set_sensitive(True) - # Don't autorize to register with a server via disco + # Don't authorize to register with a server via disco if self.register_button and nbxmpp.NS_REGISTER in features and \ jid != self.jid: # We can register this agent @@ -1824,7 +1824,7 @@ class MucBrowser(AgentBrowser): def on_scroll(self, *args): """ - Scrollwindow callback to trigger new queries on scolling + Scrollwindow callback to trigger new queries on scrolling """ # This apparently happens when inactive sometimes self._query_visible() @@ -1860,7 +1860,7 @@ class MucBrowser(AgentBrowser): def _channel_altinfo(self, jid, node, items, name = None): """ - Callback for the alternate disco#items query. We try to atleast get the + Callback for the alternate disco#items query. We try to at least get the amount of users in the room if the service does not support MUC dataforms """ if items == 0: @@ -1958,7 +1958,7 @@ class DiscussionGroupsBrowser(AgentBrowser): """ Create treemodel for the window """ - # JID, node, name (with description) - pango markup, dont have info?, subscribed? + # JID, node, name (with description) - pango markup, don't have info?, subscribed? self.model = Gtk.TreeStore(str, str, str, bool, bool) # sort by name self.model.set_sort_column_id(2, Gtk.SortType.ASCENDING) diff --git a/gajim/emoticons.py b/gajim/emoticons.py index 113c28dba..754799bb1 100644 --- a/gajim/emoticons.py +++ b/gajim/emoticons.py @@ -311,7 +311,7 @@ class EmoticonPopover(Gtk.Popover): def do_destroy(self): # Remove the references we hold to other objects self.text_widget = None - # Even though we dont destroy the Popover, handlers are getting + # Even though we don't destroy the Popover, handlers are getting # still disconnected, which makes the handler_id invalid # FIXME: find out how we can prevent handlers getting disconnected self.handler_id = None diff --git a/gajim/groupchat_control.py b/gajim/groupchat_control.py index 31e61ded9..f335dcfaa 100644 --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -75,7 +75,7 @@ log = logging.getLogger('gajim.groupchat_control') @unique class Column(IntEnum): IMG = 0 # image to show state (online, new message etc) - NICK = 1 # contact nickame or ROLE name + NICK = 1 # contact nickname or ROLE name TYPE = 2 # type of the row ('contact' or 'role') TEXT = 3 # text shown in the cellrenderer AVATAR_IMG = 4 # avatar of the contact @@ -725,7 +725,7 @@ class GroupchatControl(ChatControlBase): def _on_minimize(self, action, param): """ - When a grouchat is minimized, unparent the tab, put it in roster etc + When a groupchat is minimized, unparent the tab, put it in roster etc """ action.set_state(param) non_minimized_gc = app.config.get_per( @@ -843,7 +843,7 @@ class GroupchatControl(ChatControlBase): def tree_compare_iters(self, model, iter1, iter2, data=None): """ - Compare two iters to sort them + Compare two iterators to sort them """ type1 = model[iter1][Column.TYPE] type2 = model[iter2][Column.TYPE] @@ -2315,7 +2315,7 @@ class GroupchatControl(ChatControlBase): return includes = app.config.get('confirm_close_muc_rooms').split(' ') excludes = app.config.get('noconfirm_close_muc_rooms').split(' ') - # whether to ask for comfirmation before closing muc + # whether to ask for confirmation before closing muc if (app.config.get('confirm_close_muc') or self.room_jid in includes)\ and app.gc_connected[self.account][self.room_jid] and self.room_jid \ not in excludes: @@ -2460,7 +2460,7 @@ class GroupchatControl(ChatControlBase): fjid = self.room_jid + '/' + nick if nick.lower().startswith(begin.lower()) and not \ helpers.jid_is_blocked(self.account, fjid): - # the word is the begining of a nick + # the word is the beginning of a nick self.nick_hits.append(nick) if len(self.nick_hits): if len(splitted_text) < 2 or with_refer_to_nick_char: @@ -2472,13 +2472,13 @@ class GroupchatControl(ChatControlBase): start_iter = end_iter.copy() if self.last_key_tabs and with_refer_to_nick_char or (text and \ text[-1] == ' '): - # have to accomodate for the added space from last + # have to accommodate for the added space from last # completion # gc_refer_to_nick_char may be more than one char! start_iter.backward_chars(len(begin) + len(add)) elif self.last_key_tabs and not app.config.get( 'shell_like_completion'): - # have to accomodate for the added space from last + # have to accommodate for the added space from last # completion start_iter.backward_chars(len(begin) + \ len(gc_refer_to_nick_char)) @@ -2730,8 +2730,8 @@ class GroupchatControl(ChatControlBase): def on_row_activated(self, widget, path): """ - When an iter is activated (dubblick or single click if gnome is set this - way + When an iter is activated (double click or single click if gnome + is set this way) """ if path.get_depth() == 1: # It's a group if (widget.row_expanded(path)):