summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--poezio/core/handlers.py8
-rw-r--r--poezio/tabs/muctab.py20
-rwxr-xr-xpoezio/theming.py2
3 files changed, 15 insertions, 15 deletions
diff --git a/poezio/core/handlers.py b/poezio/core/handlers.py
index 95fa6a48..a947917b 100644
--- a/poezio/core/handlers.py
+++ b/poezio/core/handlers.py
@@ -472,7 +472,7 @@ class HandlerCore:
def on_nick_received(self, message):
"""
- Called when a pep notification for an user nickname
+ Called when a pep notification for a user nickname
is received
"""
contact = roster[message['from'].bare]
@@ -527,7 +527,7 @@ class HandlerCore:
def on_mood_event(self, message):
"""
- Called when a pep notification for an user mood
+ Called when a pep notification for a user mood
is received.
"""
contact = roster[message['from'].bare]
@@ -565,7 +565,7 @@ class HandlerCore:
def on_activity_event(self, message):
"""
- Called when a pep notification for an user activity
+ Called when a pep notification for a user activity
is received.
"""
contact = roster[message['from'].bare]
@@ -611,7 +611,7 @@ class HandlerCore:
def on_tune_event(self, message):
"""
- Called when a pep notification for an user tune
+ Called when a pep notification for a user tune
is received
"""
contact = roster[message['from'].bare]
diff --git a/poezio/tabs/muctab.py b/poezio/tabs/muctab.py
index d71656b6..17abb369 100644
--- a/poezio/tabs/muctab.py
+++ b/poezio/tabs/muctab.py
@@ -47,7 +47,7 @@ COMPARE_USERS_LAST_TALKED = lambda x: x.last_talked
class MucTab(ChatTab):
"""
The tab containing a multi-user-chat room.
- It contains an userlist, an input, a topic, an information and a chat zone
+ It contains a userlist, an input, a topic, an information and a chat zone
"""
message_type = 'groupchat'
plugin_commands = {} # type: Dict[str, Command]
@@ -891,7 +891,7 @@ class MucTab(ChatTab):
from_room: JID,
server_initiated=False):
"""
- When an user leaves a groupchat
+ When a user leaves a groupchat
"""
self.users.remove(user)
if self.own_nick == user.nick:
@@ -952,7 +952,7 @@ class MucTab(ChatTab):
def on_user_change_status(self, user, from_nick, from_room, affiliation,
role, show, status):
"""
- When an user changes her status
+ When a user changes her status
"""
# build the message
display_message = False # flag to know if something significant enough
@@ -1567,7 +1567,7 @@ class MucTab(ChatTab):
def command_role(self, args):
"""
/role <nick> <role> [reason]
- Changes the role of an user
+ Changes the role of a user
roles can be: none, visitor, participant, moderator
"""
@@ -1585,7 +1585,7 @@ class MucTab(ChatTab):
def command_affiliation(self, args):
"""
/affiliation <nick or jid> <affiliation>
- Changes the affiliation of an user
+ Changes the affiliation of a user
affiliations can be: outcast, none, member, admin, owner
"""
@@ -1908,11 +1908,11 @@ class MucTab(ChatTab):
self.command_role,
'usage':
'<nick> <role> [reason]',
- 'desc': ('Set the role of an user. Roles can be:'
+ 'desc': ('Set the role of a user. Roles can be:'
' none, visitor, participant, moderator.'
' You also can give an optional reason.'),
'shortdesc':
- 'Set the role of an user.',
+ 'Set the role of a user.',
'completion':
self.completion_role
}, {
@@ -1922,10 +1922,10 @@ class MucTab(ChatTab):
self.command_affiliation,
'usage':
'<nick or jid> <affiliation>',
- 'desc': ('Set the affiliation of an user. Affiliations can be:'
+ 'desc': ('Set the affiliation of a user. Affiliations can be:'
' outcast, none, member, admin, owner.'),
'shortdesc':
- 'Set the affiliation of an user.',
+ 'Set the affiliation of a user.',
'completion':
self.completion_affiliation
}, {
@@ -2056,7 +2056,7 @@ class MucTab(ChatTab):
'in the MUC: their role, affiliation,'
' status and status message.'),
'shortdesc':
- 'Show an user\'s infos.',
+ 'Show a user\'s infos.',
'completion':
self.completion_info
}, {
diff --git a/poezio/theming.py b/poezio/theming.py
index db1ccb39..bbf2fb64 100755
--- a/poezio/theming.py
+++ b/poezio/theming.py
@@ -198,7 +198,7 @@ class Theme:
COLOR_REVISIONS_MESSAGE = (3, -1, 'b')
# Color for various important text. For example the "?" before JIDs in
- # the roster that require an user action.
+ # the roster that require a user action.
COLOR_IMPORTANT_TEXT = (3, 5, 'b')
# Separators