Change 'his/her' to 'their'

It's shorter and reads better.

Also removes 'its', which might be intented to refer to bots or the like.

9 files changed, 13 insertions, 13 deletions

diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index 4a45d15d..3f3bb475 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -428,7 +428,7 @@ MultiUserChat tab commands
         **Usage:** ``/info <nickname>``
 
         Display some information about the user in the room:
-        his/her role, affiliation, status, and status message.
+        their role, affiliation, status, and status message.
 
     /version
         **Usage:** ``/version <nickname or jid>``
diff --git a/doc/source/dev/events.rst b/doc/source/dev/events.rst
index a2e6ad9d..6dd2e65e 100644
--- a/doc/source/dev/events.rst
+++ b/doc/source/dev/events.rst
@@ -121,7 +121,7 @@ The following events are poezio-only events, for Slixmpp events, check out
     changing_nick
         - **presence:** :py:class:`~~slixmpp.Presence` to be sent
 
-        Triggered when the user changes his/her nickname on a MUC. The
+        Triggered when the user changes their nickname on a MUC. The
         presence can thus be modified before being sent.
 
     send_normal_presence
diff --git a/poezio/core/commands.py b/poezio/core/commands.py
index c9605987..b3ebb811 100644
--- a/poezio/core/commands.py
+++ b/poezio/core/commands.py
@@ -687,7 +687,7 @@ class CommandCore:
             else:
                 msg = 'The last activity of %s was %s ago%s' % (
                     from_, common.parse_secs_to_str(seconds),
-                    (' and his/her last status was %s' % status)
+                    (' and their last status was %s' % status)
                     if status else '')
             self.core.information(msg, 'Info')
 
diff --git a/poezio/core/core.py b/poezio/core/core.py
index 9651a73b..79b5d56f 100644
--- a/poezio/core/core.py
+++ b/poezio/core/core.py
@@ -1220,7 +1220,7 @@ class Core:
 
     def rename_private_tabs(self, room_name: str, old_nick: str, user: User) -> None:
         """
-        Call this method when someone changes his/her nick in a MUC,
+        Call this method when someone changes their nick in a MUC,
         this updates the name of all the opened private conversations
         with him/her
         """
diff --git a/poezio/core/handlers.py b/poezio/core/handlers.py
index 9cdfb59a..95fa6a48 100644
--- a/poezio/core/handlers.py
+++ b/poezio/core/handlers.py
@@ -561,7 +561,7 @@ class HandlerCore:
                     'Mood')
             else:
                 self.core.information(
-                    contact.bare_jid + ' stopped having his/her mood.', 'Mood')
+                    contact.bare_jid + ' stopped having their mood.', 'Mood')
 
     def on_activity_event(self, message):
         """
@@ -606,7 +606,7 @@ class HandlerCore:
                     contact.activity, 'Activity')
             else:
                 self.core.information(
-                    contact.bare_jid + ' stopped doing his/her activity.',
+                    contact.bare_jid + ' stopped doing their activity.',
                     'Activity')
 
     def on_tune_event(self, message):
@@ -1015,7 +1015,7 @@ class HandlerCore:
             contact.pending_out = False
         else:
             self.core.information(
-                '%s does not want you to receive his/her/its status anymore.' %
+                '%s does not want you to receive their/its status anymore.' %
                 jid, 'Roster')
         self.core.tabs.first().state = 'highlight'
         if isinstance(self.core.tabs.current_tab, tabs.RosterInfoTab):
diff --git a/poezio/tabs/conversationtab.py b/poezio/tabs/conversationtab.py
index 05ca06c0..60106527 100644
--- a/poezio/tabs/conversationtab.py
+++ b/poezio/tabs/conversationtab.py
@@ -205,7 +205,7 @@ class ConversationTab(OneToOneTab):
                     dump_tuple(get_theme().COLOR_INFORMATION_TEXT),
                     from_,
                     common.parse_secs_to_str(seconds),
-                    (' and his/her last status was %s' % status)
+                    (' and their last status was %s' % status)
                     if status else '',
                 )
             self.add_message(msg)
diff --git a/poezio/tabs/muctab.py b/poezio/tabs/muctab.py
index d77aaf39..d71656b6 100644
--- a/poezio/tabs/muctab.py
+++ b/poezio/tabs/muctab.py
@@ -124,14 +124,14 @@ class MucTab(ChatTab):
 
     def cancel_config(self, form):
         """
-        The user do not want to send his/her config, send an iq cancel
+        The user do not want to send their config, send an iq cancel
         """
         muc.cancel_config(self.core.xmpp, self.name)
         self.core.close_tab()
 
     def send_config(self, form):
         """
-        The user sends his/her config to the server
+        The user sends their config to the server
         """
         muc.configure_room(self.core.xmpp, self.name, form)
         self.core.close_tab()
@@ -2053,7 +2053,7 @@ class MucTab(ChatTab):
             'usage':
             '<nickname>',
             'desc': ('Display some information about the user '
-                     'in the MUC: its/his/her role, affiliation,'
+                     'in the MUC: their role, affiliation,'
                      ' status and status message.'),
             'shortdesc':
             'Show an user\'s infos.',
diff --git a/poezio/tabs/privatetab.py b/poezio/tabs/privatetab.py
index 32b39aea..cec68ac5 100644
--- a/poezio/tabs/privatetab.py
+++ b/poezio/tabs/privatetab.py
@@ -55,7 +55,7 @@ class PrivateTab(OneToOneTab):
             'info',
             self.command_info,
             desc=
-            'Display some information about the user in the MUC: its/his/her role, affiliation, status and status message.',
+            'Display some information about the user in the MUC: their role, affiliation, status and status message.',
             shortdesc='Info about the user.')
         self.register_command(
             'version',
diff --git a/poezio/tabs/rostertab.py b/poezio/tabs/rostertab.py
index 86db06a0..6e73051e 100644
--- a/poezio/tabs/rostertab.py
+++ b/poezio/tabs/rostertab.py
@@ -88,7 +88,7 @@ class RosterInfoTab(Tab):
             usage='[jid]',
             desc='Deny your presence to the provided JID (or the '
             'selected contact in your roster), who is asking'
-            'you to be in his/her roster.',
+            'you to be in their roster.',
             shortdesc='Deny a user your presence.',
             completion=self.completion_deny)
         self.register_command(