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

he --> he or she

This commit is contained in:
Nikos Kouremenos 2005-11-12 14:17:27 +00:00
parent a38263dcdb
commit 2a770a1ebf
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/GnuPG.py
View File

@ -29,7 +29,7 @@ except ImportError:
try: try:
from common import GnuPGInterface # use 'our' file from common import GnuPGInterface # use 'our' file
except ImportError: except ImportError:
USE_GPG = False # user can't do OpenGPG only if he removed the file! USE_GPG = False # user can't do OpenGPG only if he or she removed the file!
else: else:
class GnuPG(GnuPGInterface.GnuPG): class GnuPG(GnuPGInterface.GnuPG):

2
src/common/helpers.py
View File

@ -355,7 +355,7 @@ def get_uf_chatstate(chatstate):
elif chatstate == 'composing': elif chatstate == 'composing':
return _('is composing a message...') return _('is composing a message...')
elif chatstate == 'paused': elif chatstate == 'paused':
#paused means he was compoing but has stopped for a while #paused means he or she was compoing but has stopped for a while
return _('paused composing a message') return _('paused composing a message')
elif chatstate == 'gone': elif chatstate == 'gone':
return _('has closed the chat window or tab') return _('has closed the chat window or tab')

2
src/conversation_textview.py
View File

@ -373,7 +373,7 @@ class ConversationTextview(gtk.TextView):
c = gajim.contacts[self.account][text][0] c = gajim.contacts[self.account][text][0]
if _('not in the roster') in c.groups: if _('not in the roster') in c.groups:
allow_add = True allow_add = True
else: # he's not at all in the account contacts else: # he or she's not at all in the account contacts
allow_add = True allow_add = True
if allow_add: if allow_add:

4
src/gajim.py
View File

@ -431,7 +431,7 @@ class Interface:
contact = gajim.get_first_contact_instance_from_jid(account, jid) contact = gajim.get_first_contact_instance_from_jid(account, jid)
if self.windows[account]['chats'].has_key(jid): if self.windows[account]['chats'].has_key(jid):
chat_win = self.windows[account]['chats'][jid] chat_win = self.windows[account]['chats'][jid]
if chatstate is not None: # he sent us reply, so he supports jep85 if chatstate is not None: # he or she sent us reply, so he supports jep85
if contact.chatstate == 'ask': # we were jep85 disco? if contact.chatstate == 'ask': # we were jep85 disco?
contact.chatstate = 'active' # no more contact.chatstate = 'active' # no more
@ -1177,7 +1177,7 @@ class Interface:
strerr = os.strerror(err_code) strerr = os.strerror(err_code)
print strerr print strerr
# it is good to notify the user # it is good to notify the user
# in case he cannot see the output of the console # in case he or she cannot see the output of the console
dialogs.ErrorDialog(_('Cannot save your preferences'), dialogs.ErrorDialog(_('Cannot save your preferences'),
strerr).get_response() strerr).get_response()
sys.exit(1) sys.exit(1)

2
src/roster_window.py
View File

@ -2626,7 +2626,7 @@ _('If "%s" accepts this request you will know his or her status.') %jid)
else: else:
if not gajim.config.get('trayicon'): if not gajim.config.get('trayicon'):
# cannot happen via GUI, but I put this incase user touches config # cannot happen via GUI, but I put this incase user touches config
self.window.show_all() # without trayicon, he should see the roster! self.window.show_all() # without trayicon, he or she should see the roster!
gajim.config.set('show_roster_on_startup', True) gajim.config.set('show_roster_on_startup', True)
if len(gajim.connections) == 0: # if we have no account if len(gajim.connections) == 0: # if we have no account