Commit c3a359ba authored by Ave Ozkal's avatar Ave Ozkal

Change to gender-neutral alternatives of pronouns

parent aaab5f17
......@@ -214,7 +214,7 @@ class StandardCommonChatCommands(CommandContainer):
self._video_button.set_active(not state)
@command(raw=True)
@doc(_("Send a message to the contact that will attract his (her) attention"))
@doc(_("Send a message to the contact that will attract their attention"))
def attention(self, message):
self.send_message(message, process_commands=False, attention=True)
......
......@@ -245,8 +245,8 @@ class Config:
'show_tunes_in_roster': [opt_bool, True, '', True],
'show_location_in_roster': [opt_bool, True, '', True],
'avatar_position_in_roster': [opt_str, 'right', _('Define the position of the avatar in roster. Can be left or right'), True],
'print_status_in_chats': [opt_bool, False, _('If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or his or her status message.')],
'print_status_in_muc': [opt_str, 'none', _('Can be "none", "all" or "in_and_out". If "none", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If "all" Gajim will print all status messages. If "in_and_out", Gajim will only print FOO enters/leaves group chat.')],
'print_status_in_chats': [opt_bool, False, _('If False, Gajim will no longer print status line in chats when a contact changes their status and/or their status message.')],
'print_status_in_muc': [opt_str, 'none', _('Can be "none", "all" or "in_and_out". If "none", Gajim will no longer print status line in groupchats when a member changes their status and/or their status message. If "all" Gajim will print all status messages. If "in_and_out", Gajim will only print FOO enters/leaves group chat.')],
'log_contact_status_changes': [opt_bool, False],
'log_xhtml_messages': [opt_bool, False, _('Log XHTML messages instead of plain text messages.')],
'just_connected_bg_color': [opt_str, '#adc3c6', _('Background color of contacts when they just signed in.')],
......
......@@ -162,7 +162,7 @@ class VCardAvatars:
return
if gc_contact.avatar_sha != avatar_sha:
log.info('%s changed his Avatar: %s', nick, avatar_sha)
log.info('%s changed their Avatar: %s', nick, avatar_sha)
gc_contact.avatar_sha = avatar_sha
app.interface.update_avatar(contact=gc_contact)
else:
......
......@@ -1839,7 +1839,7 @@ class GroupchatControl(ChatControlBase):
self.print_conversation(s, 'info', graphics=False)
if obj.nick == self.nick:
self.autorejoin = False
elif '303' in obj.status_code: # Someone changed his or her nick
elif '303' in obj.status_code: # Someone changed their nick
if obj.new_nick == self.new_nick or obj.nick == self.nick:
# We changed our nick
self.nick = obj.new_nick
......
......@@ -531,7 +531,7 @@ class Interface:
app.contacts.add_contact(account, contact1)
self.roster.add_contact(obj.jid, account)
dialogs.InformationDialog(_('Authorization accepted'),
_('The contact "%s" has authorized you to see his or her status.')
_('The contact "%s" has authorized you to see their status.')
% obj.jid)
def show_unsubscribed_dialog(self, account, contact):
......
......@@ -2162,7 +2162,7 @@ class RosterWindow:
def chg_contact_status(self, contact, show, status, account):
"""
When a contact changes his or her status
When a contact changes their status
"""
contact_instances = app.contacts.get_contacts(account, contact.jid)
contact.show = show
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment