copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into 'master' 

Use more gender neutral language

See merge request !55
This commit is contained in:
Yann Leboulanger 2017-02-11 21:16:26 +01:00
parent 26aa0382d3 f5eb35cba3
commit c8e03993fe
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chat_control.py
View File

@ -429,7 +429,7 @@ class ChatControl(ChatControlBase):
else: else:
self._send_file_button.set_tooltip_text( self._send_file_button.set_tooltip_text(
_("You need to know the real JID of the contact to send " _("You need to know the real JID of the contact to send "
"him or her a file.")) "them a file."))
# Convert to GC # Convert to GC
if gajim.config.get_per('accounts', self.account, 'is_zeroconf'): if gajim.config.get_per('accounts', self.account, 'is_zeroconf'):

4
src/gui_interface.py
View File

@ -520,8 +520,8 @@ class Interface:
list_ = [(contact, account)] list_ = [(contact, account)]
dialogs.YesNoDialog( dialogs.YesNoDialog(
_('Contact "%s" removed subscription from you') % contact.jid, _('Contact "%s" removed subscription from you') % contact.jid,
_('You will always see him or her as offline.\nDo you want to ' _('You will always see them as offline.\nDo you want to '
'remove him or her from your contact list?'), 'remove them from your contact list?'),
on_response_yes=(on_yes, list_)) on_response_yes=(on_yes, list_))
# FIXME: Per RFC 3921, we can "deny" ack as well, but the GUI does # FIXME: Per RFC 3921, we can "deny" ack as well, but the GUI does
# not show deny # not show deny

4
src/roster_window.py
View File

@ -3575,7 +3575,7 @@ class RosterWindow:
if contact.sub == 'to': if contact.sub == 'to':
dialogs.ConfirmationDialog(pritext, sectext + \ dialogs.ConfirmationDialog(pritext, sectext + \
_('By removing this contact you also remove authorization ' _('By removing this contact you also remove authorization '
'resulting in him or her always seeing you as offline.'), 'resulting in them always seeing you as offline.'),
on_response_ok=(on_ok2, list_)) on_response_ok=(on_ok2, list_))
elif _('Not in Roster') in contact.get_shown_groups(): elif _('Not in Roster') in contact.get_shown_groups():
# Contact is not in roster # Contact is not in roster
@ -3585,7 +3585,7 @@ class RosterWindow:
else: else:
dialogs.ConfirmationDialogCheck(pritext, sectext + \ dialogs.ConfirmationDialogCheck(pritext, sectext + \
_('By removing this contact you also by default remove ' _('By removing this contact you also by default remove '
'authorization resulting in him or her always seeing you as' 'authorization resulting in them always seeing you as'
' offline.'), ' offline.'),
_('I want this contact to know my status after removal'), _('I want this contact to know my status after removal'),
on_response_ok=(on_ok, list_)) on_response_ok=(on_ok, list_))