From 2a770a1ebfcd76b253393db14a37e1b011f533b9 Mon Sep 17 00:00:00 2001
From: Nikos Kouremenos <kourem@gmail.com>
Date: Sat, 12 Nov 2005 14:17:27 +0000
Subject: [PATCH] he --> he or she

---
 src/common/GnuPG.py          | 2 +-
 src/common/helpers.py        | 2 +-
 src/conversation_textview.py | 2 +-
 src/gajim.py                 | 4 ++--
 src/roster_window.py         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/common/GnuPG.py b/src/common/GnuPG.py
index f2e8c4da0..6a0652b1a 100644
--- a/src/common/GnuPG.py
+++ b/src/common/GnuPG.py
@@ -29,7 +29,7 @@ except ImportError:
 	try:
 		from common import GnuPGInterface # use 'our' file
 	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:
 	class GnuPG(GnuPGInterface.GnuPG):
diff --git a/src/common/helpers.py b/src/common/helpers.py
index 781e3b964..9e93941a1 100644
--- a/src/common/helpers.py
+++ b/src/common/helpers.py
@@ -355,7 +355,7 @@ def get_uf_chatstate(chatstate):
 	elif chatstate == 'composing':
 		return _('is composing a message...')
 	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')
 	elif chatstate == 'gone':
 		return _('has closed the chat window or tab')
diff --git a/src/conversation_textview.py b/src/conversation_textview.py
index 266927e62..3e5957ace 100644
--- a/src/conversation_textview.py
+++ b/src/conversation_textview.py
@@ -373,7 +373,7 @@ class ConversationTextview(gtk.TextView):
 				c = gajim.contacts[self.account][text][0]
 				if _('not in the roster') in c.groups:
 					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
 			
 			if allow_add:
diff --git a/src/gajim.py b/src/gajim.py
index 40dfdd6ed..dd639ec75 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -431,7 +431,7 @@ class Interface:
 		contact = gajim.get_first_contact_instance_from_jid(account, jid)
 		if self.windows[account]['chats'].has_key(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?
 					contact.chatstate = 'active' # no more
 				
@@ -1177,7 +1177,7 @@ class Interface:
 			strerr = os.strerror(err_code)
 			print strerr
 			# 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'),
 				strerr).get_response()
 			sys.exit(1)
diff --git a/src/roster_window.py b/src/roster_window.py
index 199c6c234..20a47b76c 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -2626,7 +2626,7 @@ _('If "%s" accepts this request you will know his or her status.') %jid)
 		else:
 			if not gajim.config.get('trayicon'):
 				# 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)
 
 		if len(gajim.connections) == 0: # if we have no account