summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--poezio/bookmarks.py2
-rw-r--r--poezio/common.py2
-rw-r--r--poezio/core/core.py4
-rw-r--r--poezio/core/handlers.py6
-rw-r--r--poezio/tabs/muclisttab.py2
-rw-r--r--poezio/text_buffer.py2
-rw-r--r--poezio/windows/text_win.py6
7 files changed, 12 insertions, 12 deletions
diff --git a/poezio/bookmarks.py b/poezio/bookmarks.py
index 766cb7f2..8dd5cd40 100644
--- a/poezio/bookmarks.py
+++ b/poezio/bookmarks.py
@@ -10,7 +10,7 @@ bookmarks, both local and remote.
Poezio start scenario:
-- upon inital connection, poezio will disco#info the server
+- upon initial connection, poezio will disco#info the server
- the available storage methods will be stored in the available_storage dict
(either 'pep' or 'privatexml')
- if only one is available, poezio will set the use_bookmarks_method config option
diff --git a/poezio/common.py b/poezio/common.py
index 0c6a77a8..a7579fcc 100644
--- a/poezio/common.py
+++ b/poezio/common.py
@@ -109,7 +109,7 @@ DISTRO_INFO = {
def get_os_info():
"""
- Returns a detailed and well formated string containing
+ Returns a detailed and well formatted string containing
information about the operating system
:rtype: str
diff --git a/poezio/core/core.py b/poezio/core/core.py
index 38d564b8..64ded385 100644
--- a/poezio/core/core.py
+++ b/poezio/core/core.py
@@ -580,7 +580,7 @@ class Core(object):
catches SIGWINCH itself. In its signal handler, it updates the
windows structures (for example the size, etc) and it
ungetch(KEY_RESIZE). That way, the next time we call getch() we know
- that a resize occured and we can act on it. BUT poezio doesn’t call
+ that a resize occurred and we can act on it. BUT poezio doesn’t call
getch() until it knows it will return something. The problem is we
can’t know that, because stdin is not affected by this KEY_RESIZE
value (it is only inserted in a ncurses internal fifo that we can’t
@@ -1615,7 +1615,7 @@ class Core(object):
def _pop_information_win_up(self, size, time):
"""
- Temporarly increase the size of the information win of size lines
+ Temporarily increase the size of the information win of size lines
during time seconds.
After that delay, the size will decrease from size lines.
"""
diff --git a/poezio/core/handlers.py b/poezio/core/handlers.py
index d7c51d8d..f1a8bcb9 100644
--- a/poezio/core/handlers.py
+++ b/poezio/core/handlers.py
@@ -1242,7 +1242,7 @@ class HandlerCore:
if show_unavailable or hide_unavailable or non_priv or logging_off\
or non_anon or semi_anon or full_anon:
tab.add_message(
- '\x19%(info_col)s}Info: A configuration change not privacy-related occured.'
+ '\x19%(info_col)s}Info: A configuration change not privacy-related occurred.'
% {
'info_col': dump_tuple(
get_theme().COLOR_INFORMATION_TEXT)
@@ -1584,7 +1584,7 @@ class HandlerCore:
if status == 'error':
return self.core.information(
- "An error occured while executing the command")
+ "An error occurred while executing the command")
if status == 'executing':
if not form:
@@ -1616,7 +1616,7 @@ class HandlerCore:
self.core.xmpp.plugin['xep_0050'].terminate_command(adhoc_session)
error_message = self.core.get_error_message(iq)
self.core.information(
- "An error occured while executing the command: %s" %
+ "An error occurred while executing the command: %s" %
(error_message), 'Error')
def _cancel_adhoc_command(self, form, session):
diff --git a/poezio/tabs/muclisttab.py b/poezio/tabs/muclisttab.py
index 005f3fe1..e12d24ee 100644
--- a/poezio/tabs/muclisttab.py
+++ b/poezio/tabs/muclisttab.py
@@ -1,7 +1,7 @@
"""
A MucListTab is a tab listing the rooms on a conference server.
-It has no functionnality except scrolling the list, and allowing the
+It has no functionality except scrolling the list, and allowing the
user to join the rooms.
"""
import logging
diff --git a/poezio/text_buffer.py b/poezio/text_buffer.py
index b247a8d8..4e0f4b90 100644
--- a/poezio/text_buffer.py
+++ b/poezio/text_buffer.py
@@ -5,7 +5,7 @@ A text buffer contains a list of intermediate representations of messages
(not xml stanzas, but neither the Lines used in windows.py.
Each text buffer can be linked to multiple windows, that will be rendered
-independantly by their TextWins.
+independently by their TextWins.
"""
import logging
diff --git a/poezio/windows/text_win.py b/poezio/windows/text_win.py
index 1521ee34..b923b712 100644
--- a/poezio/windows/text_win.py
+++ b/poezio/windows/text_win.py
@@ -189,7 +189,7 @@ class TextWin(BaseTextWin):
"""
Go to the next highlight in the buffer.
(depending on which highlight was selected before)
- if the buffer is already positionned on the last, of if there are no
+ if the buffer is already positioned on the last, of if there are no
highlights, scroll to the end of the buffer.
"""
log.debug('Going to the next highlight…')
@@ -225,7 +225,7 @@ class TextWin(BaseTextWin):
"""
Go to the previous highlight in the buffer.
(depending on which highlight was selected before)
- if the buffer is already positionned on the first, or if there are no
+ if the buffer is already positioned on the first, or if there are no
highlights, scroll to the end of the buffer.
"""
log.debug('Going to the previous highlight…')
@@ -294,7 +294,7 @@ class TextWin(BaseTextWin):
if None not in self.built_lines:
self.built_lines.append(None)
self.nb_of_highlights_after_separator = 0
- log.debug("Reseting number of highlights after separator")
+ log.debug("Resetting number of highlights after separator")
if room and room.messages:
self.separator_after = room.messages[-1]