diff --git a/libretroshare/src/ft/ftfilecreator.cc b/libretroshare/src/ft/ftfilecreator.cc
index bf93b6575..a835caf16 100644
--- a/libretroshare/src/ft/ftfilecreator.cc
+++ b/libretroshare/src/ft/ftfilecreator.cc
@@ -317,7 +317,7 @@ int ftFileCreator::locked_notifyReceived(uint64_t offset, uint32_t chunk_size)
 	{
 		// Chunk is not found. Maybe that is because the packet is in the middle
 		// of an existing chunk. This case occurs whenever a packet is lost due
-		// to temporarily interrupted connexion.  In such a case we split the
+		// to temporarily interrupted connection.  In such a case we split the
 		// chunk. Any pending block will be re-asked to the source after 40 secs.
 		//
 #ifdef FILE_DEBUG
diff --git a/libretroshare/src/pqi/authssl.cc b/libretroshare/src/pqi/authssl.cc
index 331e88c2c..565451cfd 100644
--- a/libretroshare/src/pqi/authssl.cc
+++ b/libretroshare/src/pqi/authssl.cc
@@ -1296,7 +1296,7 @@ bool    AuthSSLimpl::decrypt(void *&out, int &outlen, const void *in, int inlen)
 void AuthSSLimpl::setCurrentConnectionAttemptInfo(const std::string& gpg_id,const std::string& ssl_id,const std::string& ssl_cn)
 {
 #ifdef AUTHSSL_DEBUG
-	std::cerr << "AuthSSL: registering connexion attempt from:" << std::endl;
+	std::cerr << "AuthSSL: registering connection attempt from:" << std::endl;
 	std::cerr << "    GPG id: " << gpg_id << std::endl;
 	std::cerr << "    SSL id: " << ssl_id << std::endl;
 	std::cerr << "    SSL cn: " << ssl_cn << std::endl;
diff --git a/libretroshare/src/pqi/pqissl.cc b/libretroshare/src/pqi/pqissl.cc
index f750b3862..2870a4572 100644
--- a/libretroshare/src/pqi/pqissl.cc
+++ b/libretroshare/src/pqi/pqissl.cc
@@ -1613,7 +1613,7 @@ int 	pqissl::readdata(void *data, int len)
 			{							
 				// SSL_WANT_READ is not a crittical error. It's just a sign that
 				// the internal SSL buffer is not ready to accept more data. So -1 
-				// is returned, and the connexion will be retried as is on next
+				// is returned, and the connection will be retried as is on next
 				// call of readdata().
 
 #ifdef PQISSL_DEBUG
diff --git a/libretroshare/src/pqi/pqissllistener.cc b/libretroshare/src/pqi/pqissllistener.cc
index 13d6108ed..9d0a4288a 100644
--- a/libretroshare/src/pqi/pqissllistener.cc
+++ b/libretroshare/src/pqi/pqissllistener.cc
@@ -381,13 +381,13 @@ int	pqissllistenbase::continueSSL(IncomingSSLInfo& incoming_connexion_info, bool
 	// attempt the accept again.
 	int fd =  SSL_get_fd(incoming_connexion_info.ssl);
 
-	// clear the connexion info that will be filled in by the callback.
+	// clear the connection info that will be filled in by the callback.
 	//
 	AuthSSL::getAuthSSL()->setCurrentConnectionAttemptInfo(std::string(),std::string(),std::string()) ;
 
 	int err = SSL_accept(incoming_connexion_info.ssl);
 
-	// No grab the connexion info that was filled in by the callback.
+	// No grab the connection info that was filled in by the callback.
 	//
 	AuthSSL::getAuthSSL()->getCurrentConnectionAttemptInfo(incoming_connexion_info.gpgid,incoming_connexion_info.sslid,incoming_connexion_info.sslcn) ;
 
diff --git a/libretroshare/src/retroshare/rsmsgs.h b/libretroshare/src/retroshare/rsmsgs.h
index 2380ef5f6..c2487729a 100644
--- a/libretroshare/src/retroshare/rsmsgs.h
+++ b/libretroshare/src/retroshare/rsmsgs.h
@@ -73,7 +73,7 @@
 #define RS_MSGTAGTYPE_LATER      5
 #define RS_MSGTAGTYPE_USER       100
 
-#define RS_CHAT_LOBBY_PRIVACY_LEVEL_CHALLENGE  	0	/* Used to accept connexion challenges only. */
+#define RS_CHAT_LOBBY_PRIVACY_LEVEL_CHALLENGE  	0	/* Used to accept connection challenges only. */
 #define RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC  		1	/* lobby is visible by friends. Friends can connect.*/
 #define RS_CHAT_LOBBY_PRIVACY_LEVEL_PRIVATE 		2	/* lobby invisible by friends. Peers on invitation only .*/
 
diff --git a/libretroshare/src/services/p3chatservice.cc b/libretroshare/src/services/p3chatservice.cc
index 51395267f..c54a04226 100644
--- a/libretroshare/src/services/p3chatservice.cc
+++ b/libretroshare/src/services/p3chatservice.cc
@@ -50,9 +50,9 @@
  * #define DEBUG_DISTANT_CHAT 1
  ****/
 
-static const int 		CONNECTION_CHALLENGE_MAX_COUNT 	  =   20 ; // sends a connexion challenge every 20 messages
-static const time_t	CONNECTION_CHALLENGE_MAX_MSG_AGE	  =   30 ; // maximum age of a message to be used in a connexion challenge
-static const int 		CONNECTION_CHALLENGE_MIN_DELAY 	  =   15 ; // sends a connexion at most every 15 seconds
+static const int 		CONNECTION_CHALLENGE_MAX_COUNT 	  =   20 ; // sends a connection challenge every 20 messages
+static const time_t	CONNECTION_CHALLENGE_MAX_MSG_AGE	  =   30 ; // maximum age of a message to be used in a connection challenge
+static const int 		CONNECTION_CHALLENGE_MIN_DELAY 	  =   15 ; // sends a connection at most every 15 seconds
 static const int 		LOBBY_CACHE_CLEANING_PERIOD    	  =   10 ; // clean lobby caches every 10 secs (remove old messages)
 static const time_t 	MAX_KEEP_MSG_RECORD 					  = 1200 ; // keep msg record for 1200 secs max.
 static const time_t 	MAX_KEEP_INACTIVE_NICKNAME         =  180 ; // keep inactive nicknames for 3 mn max.
@@ -2129,7 +2129,7 @@ void p3ChatService::handleConnectionChallenge(RsChatLobbyConnectChallengeItem *i
 	// Look into message cache of all lobbys to handle the challenge.
 	//
 #ifdef CHAT_DEBUG
-	std::cerr << "p3ChatService::handleConnectionChallenge(): received connexion challenge:" << std::endl;
+	std::cerr << "p3ChatService::handleConnectionChallenge(): received connection challenge:" << std::endl;
 	std::cerr << "    Challenge code = 0x" << std::hex << item->challenge_code << std::dec << std::endl;
 	std::cerr << "    Peer Id        =   " << item->PeerId() << std::endl;
 #endif
@@ -2263,7 +2263,7 @@ void p3ChatService::invitePeerToLobby(const ChatLobbyId& lobby_id, const std::st
 {
 #ifdef CHAT_DEBUG
 	if(connexion_challenge)
-		std::cerr << "Sending connexion challenge accept to peer " << peer_id << " for lobby "<< std::hex << lobby_id << std::dec << std::endl;
+		std::cerr << "Sending connection challenge accept to peer " << peer_id << " for lobby "<< std::hex << lobby_id << std::dec << std::endl;
 	else
 		std::cerr << "Sending invitation to peer " << peer_id << " to lobby "<< std::hex << lobby_id << std::dec << std::endl;
 #endif
@@ -2810,7 +2810,7 @@ void p3ChatService::cleanLobbyCaches()
 				it->second.last_keep_alive_packet_time = now ;
 			}
 
-			// 4 - look at lobby activity and possibly send connexion challenge
+			// 4 - look at lobby activity and possibly send connection challenge
 			//
 			if(++it->second.connexion_challenge_count > CONNECTION_CHALLENGE_MAX_COUNT && now > it->second.last_connexion_challenge_time + CONNECTION_CHALLENGE_MIN_DELAY) 
 			{
@@ -2847,7 +2847,7 @@ void p3ChatService::cleanLobbyCaches()
 	for(std::list<ChatLobbyId>::const_iterator it(changed_lobbies.begin());it!=changed_lobbies.end();++it)
 		rsicontrol->getNotify().notifyChatLobbyEvent(*it,RS_CHAT_LOBBY_EVENT_KEEP_ALIVE,"------------","") ;
 
-	// send connexion challenges
+	// send connection challenges
 	//
 	for(std::list<ChatLobbyId>::const_iterator it(send_challenge_lobbies.begin());it!=send_challenge_lobbies.end();++it)
 		sendConnectionChallenge(*it) ;
diff --git a/libretroshare/src/turtle/p3turtle.h b/libretroshare/src/turtle/p3turtle.h
index 99b200cc5..e3bb1b863 100644
--- a/libretroshare/src/turtle/p3turtle.h
+++ b/libretroshare/src/turtle/p3turtle.h
@@ -61,7 +61,7 @@
 //           the correct peers, selecting randomly among all the possible tunnels for this hash.
 //      5 - when a file data packet gets back, the turtle router forwards it back to the file transfer module.
 //
-//================================ connexion to the file transfer module ===============================//
+//================================ connection to the file transfer module ===============================//
 //
 //  The turtle router should provide the ft module with the necessary interface for asking files, and
 //  retreiving data:
diff --git a/libretroshare/src/util/extaddrfinder.cc b/libretroshare/src/util/extaddrfinder.cc
index 0c2f8ee67..f6fd43b33 100644
--- a/libretroshare/src/util/extaddrfinder.cc
+++ b/libretroshare/src/util/extaddrfinder.cc
@@ -83,16 +83,16 @@ static void getPage(const std::string& server_name,std::string& page)
 	serveur.sin_port = htons(80);
 
 #ifdef EXTADDRSEARCH_DEBUG
-	printf("Connexion attempt\n");
+	printf("Connection attempt\n");
 #endif
 
 	if(unix_connect(sockfd,(struct sockaddr *)&serveur, sizeof(serveur)) == -1)
 	{
-		std::cerr << "ExtAddrFinder: Connexion error to " << server_name << std::endl ;
+		std::cerr << "ExtAddrFinder: Connection error to " << server_name << std::endl ;
 		return ;
 	}
 #ifdef EXTADDRSEARCH_DEBUG
-	std::cerr << "ExtAddrFinder: Connexion established to " << server_name << std::endl ;
+	std::cerr << "ExtAddrFinder: Connection established to " << server_name << std::endl ;
 #endif
 
 	// envoi 
diff --git a/retroshare-gui/src/gui/CreateMsgLinkDialog.cpp b/retroshare-gui/src/gui/CreateMsgLinkDialog.cpp
index 732274014..ea32c6260 100644
--- a/retroshare-gui/src/gui/CreateMsgLinkDialog.cpp
+++ b/retroshare-gui/src/gui/CreateMsgLinkDialog.cpp
@@ -123,8 +123,8 @@ void CreateMsgLinkDialog::createLink()
 		RSLinkClipboard::copyLinks(links) ;
 
 		if(!res)
-			QMessageBox::critical(NULL,tr("Messenging invite creation failed"),tr("The creation of the messenging invite failed")) ;
+			QMessageBox::critical(NULL,tr("Messaging invite creation failed"),tr("The creation of the messaging invite failed")) ;
 		else
-			QMessageBox::information(NULL,tr("Messenging invite created"),tr("Your new messenging chat invite has been copied to clipboard. You can now paste it as a Retroshare link.")) ;
+			QMessageBox::information(NULL,tr("Messaging invite created"),tr("Your new messaging chat invite has been copied to clipboard. You can now paste it as a Retroshare link.")) ;
 #endif
 }
diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp
index eb87d2ca8..f3809691d 100644
--- a/retroshare-gui/src/gui/RetroShareLink.cpp
+++ b/retroshare-gui/src/gui/RetroShareLink.cpp
@@ -1199,7 +1199,7 @@ static void processList(const QStringList &list, const QString &textSingular, co
 
 					if(link._time_stamp < time(NULL))
 					{
-						QMessageBox::information(NULL,QObject::tr("Messenging link is expired"),QObject::tr("This Messenging link is expired. The destination peer will not receive it.")) ;
+						QMessageBox::information(NULL,QObject::tr("Messaging link is expired"),QObject::tr("This Messaging link is expired. The destination peer will not receive it.")) ;
 						break ;
 					}
 	
@@ -1220,7 +1220,7 @@ static void processList(const QStringList &list, const QString &textSingular, co
 					}
 					if(link._GPGid.toStdString() != rsPeers->getGPGOwnId())
 					{
-						QMessageBox::information(NULL,QObject::tr("Chat link cannot be decrypted"),QObject::tr("This chat link is encrypted with a key that is not yours. You can't used it. Key ID = ")+link._GPGid) ;
+						QMessageBox::information(NULL,QObject::tr("Chat link cannot be decrypted"),QObject::tr("This chat link is encrypted with a key that is not yours. You can't use it. Key ID = ")+link._GPGid) ;
 						break ;
 					}
 
@@ -1237,7 +1237,7 @@ static void processList(const QStringList &list, const QString &textSingular, co
 							case RS_DISTANT_CHAT_ERROR_SIGNATURE_MISMATCH: error_msg = QObject::tr("The link signature cannot be checked.") ; break ;
 							case RS_DISTANT_CHAT_ERROR_UNKNOWN_KEY:        error_msg = QObject::tr("The link is signed by an unknown key.") ; break ;
 						}
-						QMessageBox::information(NULL,QObject::tr("Chat connexion is not possible"),error_msg) ;
+						QMessageBox::information(NULL,QObject::tr("Chat connection is not possible"),error_msg) ;
 					}
 					else
 						ChatDialog::chatFriend(hash);