Fixed: Typos detected by Lintian

code/nel/include/nel/3d/coarse_mesh_manager.h

@@ -84,7 +84,7 @@ public:
 	void		setTextureFile (const char* file);
 
 	/**
-	  * Add a coarse mesh in the manager. If an error occured, it returns CantAddCoarseMesh.
+	  * Add a coarse mesh in the manager. If an error occurred, it returns CantAddCoarseMesh.
 	  *	\param vBuffer the VertexBuffer pre-transformed / Colored. Size MUST be numVertices*NL3D_COARSEMESH_VERTEX_FORMAT_MGR
 	  *	\param indexBuffer containing triangles that will be inserted.
 	  *	\return false if the mesh can't be added to this pass BECAUSE OF TOO MANY VERTICES or TOO MANY PRIMITIVES reason

code/nel/include/nel/3d/landscape.h

@@ -716,7 +716,7 @@ private:
 	bool			_RefineMode;
 	float			_FarTransition;
 	uint			_TileMaxSubdivision;
-	// For VertexProgram. true if change has occured in threshold since the last render().
+	// For VertexProgram. true if change has occurred in threshold since the last render().
 	float			_VPThresholdChange;
 
 	/// \name VertexBuffer mgt.

code/nel/include/nel/3d/ps_emitter.h

@@ -336,7 +336,7 @@ protected:
 	 * should not be called directly. Call CPSLocated::resize instead
 	 */
 	virtual void					resize(uint32 size);
-	virtual void					bounceOccured(uint32 index, TAnimationTime timeToNextSimStep);
+	virtual void					bounceOccurred(uint32 index, TAnimationTime timeToNextSimStep);
 	void							updateMaxCountVect();
 
 

code/nel/include/nel/3d/ps_located.h

@@ -66,14 +66,14 @@ class CParticleSystem;
 
 
 /// This structure helps to perform the collision step, by telling which collisionner is the nearest if there are several candidate
-/// a distance of -1 indicates that no collisions occured
+/// a distance of -1 indicates that no collisions occurred
 struct CPSCollisionInfo
 {
 	CPSCollisionInfo *Next;
-	float			  Dist;			  // Distance to the nearest collider, or -1 if not collision occured
+	float			  Dist;			  // Distance to the nearest collider, or -1 if not collision occurred
 	NLMISC::CVector   NewPos;
-	NLMISC::CVector   NewSpeed;	      // The speed of particle after a collision occured. After the updated of collision it is swapped with the post-collision speed
-	CPSZone			  *CollisionZone; // The zone on which the bounce occured, can be useful to check the behaviour in case of collision
+	NLMISC::CVector   NewSpeed;	      // The speed of particle after a collision occurred. After the updated of collision it is swapped with the post-collision speed
+	CPSZone			  *CollisionZone; // The zone on which the bounce occurred, can be useful to check the behaviour in case of collision
 	uint32			  Index;
 	CPSCollisionInfo()
 	{
@@ -906,10 +906,10 @@ protected:
 	 */
 	virtual void resize(uint32 size) = 0;
 
-	/** a bounce occured, so some action could be done. The default behaviour does nothing
+	/** a bounce occurred, so some action could be done. The default behaviour does nothing
 	 *  \param index the index of the element that bounced
 	 */
-	virtual void bounceOccured(uint32 /* index */, TAnimationTime /* timeToNextsimStep */) {}
+	virtual void bounceOccurred(uint32 /* index */, TAnimationTime /* timeToNextsimStep */) {}
 
 	/** show an drawing to represent the object, and in red if it is selected
 	 *  \param tab : a table of 2 * nbSeg vector. only the x and y coordinates are used

code/nel/include/nel/3d/ps_zone.h

@@ -120,7 +120,7 @@ protected:
 	/**
 	 * This set speed of a located so that it looks like bouncing on a surface
 	 * \param locatedIndex the index
-	 * \param bouncePoint the position where the collision occured
+	 * \param bouncePoint the position where the collision occurred
 	 * \param surfNormal  the normal of the surface at the collision point (this must be a unit vector)
 	 * \elasticity  1 = full bounce, 0 = no bounce (contact)
 	 * \ellapsedTime the time ellapsed

code/nel/include/nel/3d/water_height_map.h

@@ -79,7 +79,7 @@ public:
 
 	/** Set the userPos (relative to the height map coordinates). This is needed because a height map can't be used with large surface (such as a sea).
 	  * As a consequence, the height map is only valid below the user (e.g from user.x - 0.5 * size to user.x + 0.5 *size).
-	  * When setPos is called, and if a move has occured, new area of the height field are set to 0
+	  * When setPos is called, and if a move has occurred, new area of the height field are set to 0
 	  * The pos set will be taken in account when buffers have been swapped (e.g when the propagation time as ellapsed)
 	  */
 	void					setUserPos(sint x, sint y);

code/nel/include/nel/gui/lua_helper.h

@@ -90,7 +90,7 @@ namespace NLGUI
 		virtual std::string luaWhat() const throw() {return NLMISC::toString("LUAError: %s", what());}
 	};
 
-	// A parse error occured
+	// A parse error occurred
 	class ELuaParseError : public ELuaError
 	{
 	public:
@@ -117,7 +117,7 @@ namespace NLGUI
 		std::string	_Reason;
 	};
 
-	// A execution error occured
+	// A execution error occurred
 	class ELuaExecuteError : public ELuaError
 	{
 	public:
@@ -128,7 +128,7 @@ namespace NLGUI
 		virtual std::string luaWhat() const throw() {return NLMISC::toString("ELuaExecuteError: %s", what());}
 	};
 
-	// A bad cast occured when using lua_checkcast
+	// A bad cast occurred when using lua_checkcast
 	class ELuaBadCast : public ELuaError
 	{
 	public:

code/nel/include/nel/misc/mouse_smoother.h

@@ -46,7 +46,7 @@ public:
 	double				getSamplingPeriod() const { return _SamplingPeriod; }
 	// Reset smoother. The next returned position will be the exact position of mouse (no smoothing with previous position is done)
 	void				reset();
-	// \return trueif no sampling has occured since last resetor construction
+	// \return trueif no sampling has occurred since last resetor construction
 	bool				isReseted() const { return !_Init; }
 	// Sample pos, and return smoothed position
 	CVector2f			samplePos(const CVector2f &wantedPos, double date);

code/nel/include/nel/misc/timeout_assertion_thread.h

@@ -81,7 +81,7 @@ public:
 				}
 				//nldebug("active, leave sleep, test assert");
 
-				// If this assert occured, it means that a checked part of the code was
+				// If this assert occurred, it means that a checked part of the code was
 				// to slow and then I decided to assert to display the problem.
 				nlassert(!(_Control==ACTIVE && _Counter==lastCounter));
 			}

code/nel/include/nel/net/buf_client.h

@@ -159,7 +159,7 @@ public:
 	/** Force to send data pending in the send queue now. If all the data could not be sent immediately,
 	 * the returned nbBytesRemaining value is non-zero.
 	 * \param nbBytesRemaining If the pointer is not NULL, the method sets the number of bytes still pending after the flush attempt.
-	 * \returns False if an error has occured (e.g. the remote host is disconnected).
+	 * \returns False if an error has occurred (e.g. the remote host is disconnected).
 	 * To retrieve the reason of the error, call CSock::getLastError() and/or CSock::errorString()
 	 */
 	bool	flush( uint *nbBytesRemaining=NULL ) { return _BufSock->flush( nbBytesRemaining ); }

code/nel/include/nel/net/buf_server.h

@@ -235,7 +235,7 @@ public:
 	 * the returned nbBytesRemaining value is non-zero.
 	 * \param destid The identifier of the destination connection.
 	 * \param nbBytesRemaining If the pointer is not NULL, the method sets the number of bytes still pending after the flush attempt.
-	 * \returns False if an error has occured (e.g. the remote host is disconnected).
+	 * \returns False if an error has occurred (e.g. the remote host is disconnected).
 	 * To retrieve the reason of the error, call CSock::getLastError() and/or CSock::errorString()
 	 */
 	bool	flush( TSockId destid, uint *nbBytesRemaining=NULL );

code/nel/include/nel/net/buf_sock.h

@@ -84,7 +84,7 @@ protected:
 	///@name Sending data
 	//@{
 
-	/// Update the network sending (call this method evenly). Returns false if an error occured.
+	/// Update the network sending (call this method evenly). Returns false if an error occurred.
 	bool	update();
 
 	/** Sets the time flush trigger (in millisecond). When this time is elapsed,
@@ -101,7 +101,7 @@ protected:
 	 * (see CNonBlockingBufSock), if all the data could not be sent immediately,
 	 * the returned nbBytesRemaining value is non-zero.
 	 * \param nbBytesRemaining If the pointer is not NULL, the method sets the number of bytes still pending after the flush attempt.
-	 * \returns False if an error has occured (e.g. the remote host is disconnected).
+	 * \returns False if an error has occurred (e.g. the remote host is disconnected).
 	 * To retrieve the reason of the error, call CSock::getLastError() and/or CSock::errorString()
 	 */
 	bool	flush( uint *nbBytesRemaining=NULL );
@@ -170,7 +170,7 @@ protected:
 	}
 
 	/** Pushes a buffer to the send queue and update,
-	 * or returns false if the socket is not physically connected the or an error occured during sending
+	 * or returns false if the socket is not physically connected the or an error occurred during sending
 	 */
 	bool pushBuffer( const NLMISC::CMemStream& buffer )
 	{

code/nel/include/nel/net/pacs_client.h

@@ -553,7 +553,7 @@ static void cbPacsAnswer (CMessage &msgin, TSockId from, CCallbackNetBase &netba
 			client->getPositionSpeedCallback (id, position, speed);
 		}
 		else
-			NLMISC::nlError ("Pacs client: unkown sub message string");
+			NLMISC::nlError ("Pacs client: unknown sub message string");
 
 		// Next message ?
 		msgin.serial (again);

code/nel/include/nel/net/sock.h

@@ -121,7 +121,7 @@ public:
 	/// Releases the network engine
 	static void			releaseNetwork();
 
-	/** Returns the code of the last error that has occured.
+	/** Returns the code of the last error that has occurred.
 	 * Note: This code is platform-dependant. On Unix, it is errno; on Windows it is the Winsock error code.
 	 * See also errorString()
 	 */

code/nel/include/nel/net/unitime.h

@@ -52,7 +52,7 @@ public:
 	static const char		*getStringUniTime (NLMISC::TTime ut);
 
 
-	/** You need to call this function before calling getUniTime or an assert will occured.
+	/** You need to call this function before calling getUniTime or an assert will occurred.
 	 * This function will connect to the time service and synchronize your computer.
 	 * This function assumes that all services run on server that are time synchronized with NTP for example.
 	 * If addr is NULL, the function will connect to the Time Service via the Naming Service. In this case,
@@ -87,11 +87,11 @@ public:
 	 */
 	static void				simulate() { nlstop; _Simulate = true; }
 
-	static bool				Sync;				// true if the synchronization occured
+	static bool				Sync;				// true if the synchronization occurred
 private:
 
 	static NLMISC::TTime	_SyncUniTime;		// time in millisecond when the universal time received
-	static NLMISC::TTime	_SyncLocalTime;		// time in millisecond when the syncro with universal time occured
+	static NLMISC::TTime	_SyncLocalTime;		// time in millisecond when the syncro with universal time occurred
 
 	// If true, do not synchronize
 	static bool				_Simulate;

code/nel/include/nel/pacs/move_container.h

@@ -282,7 +282,7 @@ private:
 	// Free world image pointers
 	void						freeWorldImage (CPrimitiveWorldImage *worldImage);
 
-	// Called by CMovePrimitive when a change occured on the primitive BB
+	// Called by CMovePrimitive when a change occurred on the primitive BB
 	void						changed (CMovePrimitive* primitive, uint8 worldImage);
 
 	// Remove the collisionable primitive from the modified list

code/nel/src/3d/driver/direct3d/driver_direct3d_material.cpp

@@ -568,7 +568,7 @@ bool CDriverD3D::setupMaterial(CMaterial &mat)
 							if (_PixelProgram)
 							{
 								#ifdef NL_DEBUG_D3D
-									// Check, should not occured
+									// Check, should not occur
 									nlassertex (_PixelShader, ("STOP : no pixel shader available. Can't render this material."));
 								#endif // NL_DEBUG_D3D
 

code/nel/src/3d/driver/direct3d/driver_direct3d_texture.cpp

@@ -270,7 +270,7 @@ uint getPixelFormatSize (D3DFORMAT destFormat)
 	case D3DFMT_DXT3: bits=8; break;
 	case D3DFMT_DXT4: bits=8; break;
 	case D3DFMT_DXT5: bits=8; break;
-	default: nlstop; break;	// unkown pixel format
+	default: nlstop; break;	// unknown pixel format
 	}
 	return bits;
 }

code/nel/src/3d/ps_emitter.cpp

@@ -1901,9 +1901,9 @@ void CPSEmitter::resize(uint32 size)
 }
 
 ///==========================================================================
-void CPSEmitter::bounceOccured(uint32 index, TAnimationTime timeToNextSimStep)
+void CPSEmitter::bounceOccurred(uint32 index, TAnimationTime timeToNextSimStep)
 {
-	NL_PS_FUNC(CPSEmitter_bounceOccured)
+	NL_PS_FUNC(CPSEmitter_bounceOccurred)
 	// TODO : avoid duplication with deleteElement
 	if (_EmittedType && _EmissionType == CPSEmitter::onBounce)
 	{
@@ -2797,7 +2797,7 @@ void CPSEmitter::doEmitOnce(uint firstInstanceIndex)
 					startPos = _Owner->getParametricInfos()[k].Pos;
 				}
 				float currTime = _Owner->getTime()[k];
-				_Owner->getTime()[k] = 0.f; // when emit occured, time was 0
+				_Owner->getTime()[k] = 0.f; // when emit occurred, time was 0
 				sint32 nbToGenerate = (sint32) (emitLOD * *numToEmitPtr);
 				if (nbToGenerate > 0)
 				{
@@ -2830,7 +2830,7 @@ void CPSEmitter::doEmitOnce(uint firstInstanceIndex)
 				startPos = _Owner->getParametricInfos()[k].Pos;
 			}
 			float currTime = _Owner->getTime()[k];
-			_Owner->getTime()[k] = 0.f; // when emit occured, time was 0
+			_Owner->getTime()[k] = 0.f; // when emit occurred, time was 0
 			processEmitConsistent(startPos, k, nbToGenerate, _Owner->getAgeInSeconds(k) / CParticleSystem::RealEllapsedTimeRatio);
 			// restore time & pos
 			_Owner->getTime()[k] = currTime;

code/nel/src/3d/ps_located.cpp

@@ -1004,7 +1004,7 @@ void CPSLocated::postNewElement(const NLMISC::CVector &pos,
 		const CPSCollisionInfo &ci = _Collisions[indexInEmitter];
 		if (ci.Dist != -1.f)
 		{
-			// a collision occured, check time from collision to next time step
+			// a collision occurred, check time from collision to next time step
 			if ((emitterLocated.getPos()[indexInEmitter] - ci.NewPos) * (pos - ci.NewPos) > 0.f) return; // discard emit that are farther than the collision
 		}
 	}
@@ -1839,10 +1839,10 @@ void CPSLocated::updateCollisions()
 		{
 			_Pos[currCollision->Index] = currCollision->NewPos;
 			std::swap(_Speed[currCollision->Index], currCollision->NewSpeed); // keep speed because may be needed when removing particles
-			// notify each located bindable that a bounce occured ...
+			// notify each located bindable that a bounce occurred ...
 			for (TLocatedBoundCont::iterator it = _LocatedBoundCont.begin(); it != _LocatedBoundCont.end(); ++it)
 			{
-				(*it)->bounceOccured(currCollision->Index, computeDateFromCollisionToNextSimStep(currCollision->Index, getAgeInSeconds(currCollision->Index)));
+				(*it)->bounceOccurred(currCollision->Index, computeDateFromCollisionToNextSimStep(currCollision->Index, getAgeInSeconds(currCollision->Index)));
 			}
 			if (currCollision->CollisionZone->getCollisionBehaviour() == CPSZone::destroy)
 			{
@@ -1878,13 +1878,13 @@ void CPSLocated::updateCollisions()
 			// if particle is too old, check whether it died before the collision
 			_Pos[currCollision->Index] = currCollision->NewPos;
 			std::swap(_Speed[currCollision->Index], currCollision->NewSpeed);
-			// notify each located bindable that a bounce occured ...
+			// notify each located bindable that a bounce occurred ...
 			if (!_LocatedBoundCont.empty())
 			{
 				TAnimationTime timeFromcollisionToNextSimStep = computeDateFromCollisionToNextSimStep(currCollision->Index, getAgeInSeconds(currCollision->Index));
 				for (TLocatedBoundCont::iterator it = _LocatedBoundCont.begin(); it != _LocatedBoundCont.end(); ++it)
 				{
-					(*it)->bounceOccured(currCollision->Index, timeFromcollisionToNextSimStep);
+					(*it)->bounceOccurred(currCollision->Index, timeFromcollisionToNextSimStep);
 				}
 			}
 			if (currCollision->CollisionZone->getCollisionBehaviour() == CPSZone::destroy)
@@ -2190,7 +2190,7 @@ void CPSLocated::removeOldParticles()
 			TAnimationTime timeUntilNextSimStep;
 			if (_Collisions[*it].Dist == -1.f)
 			{
-				// no collision occured
+				// no collision occurred
 				if (_Time[*it] > 1.f)
 				{
 
@@ -2213,18 +2213,18 @@ void CPSLocated::removeOldParticles()
 			}
 			else
 			{
-				// a collision occured before particle died, so pos is already good
+				// a collision occurred before particle died, so pos is already good
 				if (_LifeScheme)
 				{
 					timeUntilNextSimStep = computeDateFromCollisionToNextSimStep(*it, _Time[*it] / _TimeIncrement[*it]);
-					// compute age of particle when collision occured
+					// compute age of particle when collision occurred
 					_Time[*it] -= timeUntilNextSimStep * _TimeIncrement[*it];
 					NLMISC::clamp(_Time[*it], 0.f, 1.f); // avoid imprecisions
 				}
 				else
 				{
 					timeUntilNextSimStep = computeDateFromCollisionToNextSimStep(*it, _Time[*it] * _InitialLife);
-					// compute age of particle when collision occured
+					// compute age of particle when collision occurred
 					_Time[*it] -= timeUntilNextSimStep / (_InitialLife == 0.f ? 1.f : _InitialLife);
 					NLMISC::clamp(_Time[*it], 0.f, 1.f); // avoid imprecisions
 				}

code/nel/src/3d/tessellation.cpp

@@ -2530,7 +2530,7 @@ void		CTessFace::refreshTesselationGeometry()
 // ***************************************************************************
 bool		CTessFace::updateBindEdge(CTessFace	*&edgeFace, bool &splitWanted)
 {
-	// Return true, when the bind should be Ok, or if a split has occured.
+	// Return true, when the bind should be Ok, or if a split has occurred.
 	// Return false only if pointers are updated, without splits.
 
 	if(edgeFace==NULL)

code/nel/src/misc/debug.cpp

@@ -1442,7 +1442,7 @@ std::string formatErrorMessage(int errorCode)
 		NULL
 	);
 
-	// empty buffer, an error occured
+	// empty buffer, an error occurred
 	if (len == 0) return toString("FormatMessage returned error %d", getLastError());
 
 	// convert wchar_t* to std::string

code/nel/src/net/buf_sock.cpp

@@ -131,7 +131,7 @@ string stringFromVectorPart( const vector<uint8>& v, uint32 pos, uint32 len )
  * (see CNonBlockingBufSock), if all the data could not be sent immediately,
  * the returned nbBytesRemaining value is non-zero.
  * \param nbBytesRemaining If the pointer is not NULL, the method sets the number of bytes still pending after the flush attempt.
- * \returns False if an error has occured (e.g. the remote host is disconnected).
+ * \returns False if an error has occurred (e.g. the remote host is disconnected).
  * To retrieve the reason of the error, call CSock::getLastError() and/or CSock::errorString()
  *
  * Note: this method works with both blocking and non-blocking sockets
@@ -270,7 +270,7 @@ void CBufSock::setTimeFlushTrigger( sint32 ms )
 
 
 /*
- * Update the network sending (call this method evenly). Returns false if an error occured.
+ * Update the network sending (call this method evenly). Returns false if an error occurred.
  */
 bool CBufSock::update()
 {

code/nel/src/net/sock.cpp

@@ -149,7 +149,7 @@ void CSock::releaseNetwork()
 }
 
 
-/* Returns the code of the last error that has occured.
+/* Returns the code of the last error that has occurred.
  * Note: This code is platform-dependant. On Unix, it is errno; on Windows it is the Winsock error code.
  * See also errorString()
  */

code/nel/src/pacs/move_container.cpp

@@ -43,7 +43,7 @@ Doc:
 	// Collisionnable primitives
 	Each primitive must be moved first with the move() method.
 	Their moves are evaluate all at once. All the collisions found are time sorted in a time orderin table (_TimeOT).
-	While the table is not empty, the first collision occured in time is solved and
+	While the table is not empty, the first collision occurred in time is solved and
 	If a collision is found, reaction() is called.
 
 

code/nel/src/sound/driver/dsound/sound_driver_dsound.cpp

@@ -563,15 +563,15 @@ void CSoundDriverDSound::initDevice(const std::string &device, ISoundDriver::TSo
 		switch (hr)
 		{
 		case DSERR_BUFFERLOST:
-			throw ESoundDriver("Failed to lock the DirectSound primary buffer : DSERR_BUFFERLOST");
+			throw ESoundDriver("Failed to lock the DirectSound primary buffer: DSERR_BUFFERLOST");
 		case DSERR_INVALIDCALL:
-			throw ESoundDriver("Failed to lock the DirectSound primary buffer : DSERR_INVALIDCALL");
+			throw ESoundDriver("Failed to lock the DirectSound primary buffer: DSERR_INVALIDCALL");
 		case DSERR_INVALIDPARAM:
-			throw ESoundDriver("Failed to lock the DirectSound primary buffer : DSERR_INVALIDPARAM");
+			throw ESoundDriver("Failed to lock the DirectSound primary buffer: DSERR_INVALIDPARAM");
 		case DSERR_PRIOLEVELNEEDED:
-			throw ESoundDriver("Failed to lock the DirectSound primary buffer : DSERR_PRIOLEVELNEEDED");
+			throw ESoundDriver("Failed to lock the DirectSound primary buffer: DSERR_PRIOLEVELNEEDED");
 		default:
-			throw ESoundDriver("Failed to lock the DirectSound primary buffer : unkown error");
+			throw ESoundDriver("Failed to lock the DirectSound primary buffer: unknown error");
 
 		}
 	}

code/nel/src/sound/sound.cpp

@@ -92,7 +92,7 @@ CSound *CSound::createSound(const std::string &filename, NLGEORGES::UFormElm& fo
 		}
 		else
 		{
-			nlassertex(false, ("SoundType unsuported : %s", dfnName.c_str()));
+			nlassertex(false, ("SoundType unsupported: %s", dfnName.c_str()));
 		}
 
 	}

code/nel/tools/3d/ligo/plugin_max/ligoscript.txt

@@ -46,7 +46,7 @@ NeLLigoGetErrorZoneTemplate code_array vertex_id_array message_array error_index
 Get the export errors after a call to NeLLigoExportZoneTemplate.
 
 code_array is an integer array with the error code. (2 for OpenedEdge, 4 for InvalidVertexList, 5 for NotInserted)
-vertex_id_array is an integer array with the id of the vertex where an error occured.
+vertex_id_array is an integer array with the id of the vertex where an error occurred.
 message_array is a string array with the error message for the vertices
 error_index is the id of the error buffer (1 ~ 9)
 

code/nel/tools/3d/plugin_max/nel_export/nel_export_script.cpp

@@ -873,7 +873,7 @@ Value* get_file_modification_date_cf (Value** arg_list, int count)
 	check_arg_count(NeLGetFileModificationDate , 1, count);
 	
 	// Check to see if the arguments match up to what we expect
-	char *message = "date NeLGetFileModificationDate [filename] - If an error occured, returns undefined.";
+	char *message = "date NeLGetFileModificationDate [filename] - If an error occurred, returns undefined.";
 	
 	//type_check
 	type_check (arg_list[0], String, message);
@@ -911,7 +911,7 @@ Value* set_file_modification_date_cf (Value** arg_list, int count)
 	check_arg_count(NeLSetFileModificationDate , 2, count);
 	
 	// Check to see if the arguments match up to what we expect
-	char *message = "bool NeLSetFileModificationDate [filename] [date] - If an error occured, returns false.";
+	char *message = "bool NeLSetFileModificationDate [filename] [date] - If an error occurred, returns false.";
 	
 	//type_check
 	type_check (arg_list[0], String, message);

code/nel/tools/3d/plugin_max/nel_mesh_lib/export_collision.cpp

@@ -263,7 +263,7 @@ CCollisionMeshBuild*	CExportNel::createCollisionMeshBuild(std::vector<INode *> &
 	// report warnings
 	if (!warnings.empty())
 	{
-		string	message = "Warning(s) occured during collision export\n(defective links may result) error";
+		string	message = "Warning(s) occurred during collision export\n(defective links may result) error";
 		for (i=0; i<warnings.size(); ++i)
 			message += string("\n")+warnings[i];
 
@@ -290,7 +290,7 @@ CCollisionMeshBuild*	CExportNel::createCollisionMeshBuild(std::vector<INode *> &
 	// report warnings
 	if (!errors.empty())
 	{
-		string	message = "Error(s) occured during collision export\n(edge issues)";
+		string	message = "Error(s) occurred during collision export\n(edge issues)";
 		for (i=0; i<errors.size(); ++i)
 			message += string("\nERROR: ")+errors[i];
 
@@ -314,7 +314,7 @@ CCollisionMeshBuild*	CExportNel::createCollisionMeshBuild(std::vector<INode *> &
 		pCollisionMeshBuild = NULL;
 	}
 
-	// Return the shape pointer or NULL if an error occured.
+	// Return the shape pointer or NULL if an error occurred.
 	return pCollisionMeshBuild;
 }
 

code/nel/tools/3d/plugin_max/nel_mesh_lib/export_mesh.cpp

@@ -116,7 +116,7 @@ CMesh::CMeshBuild*	CExportNel::createMeshBuild(INode& node, TimeValue tvTime, CM
 		}
 	}
 
-	// Return the shape pointer or NULL if an error occured.
+	// Return the shape pointer or NULL if an error occurred.
 	return pMeshBuild;
 }
 
@@ -467,7 +467,7 @@ NL3D::IShape *CExportNel::buildShape (INode& node, TimeValue time, const TInodeP
 		retShape->setDistMax (distmax);
 	}
 
-	// Return the shape pointer or NULL if an error occured.
+	// Return the shape pointer or NULL if an error occurred.
 	return retShape;
 }
 
@@ -1421,7 +1421,7 @@ IMeshGeom *CExportNel::buildMeshGeom (INode& node, TimeValue time, const TInodeP
 	if (InfoLog)
 		InfoLog->display("End of %s \n", node.GetName());
 
-	// Return the shape pointer or NULL if an error occured.
+	// Return the shape pointer or NULL if an error occurred.
 	return meshGeom;
 }
 

code/nel/tools/3d/plugin_max/nel_patch_converter/rykolscript.txt

@@ -261,6 +261,6 @@ If file0 doesn't exist the function return true
 If date (file0) <= date (file1) the function return true
 If date (file0) > date (file1) the function return false
 If file1 doesn't exist the function return undefined
-If an error occured, the function return undefined
+If an error occurred, the function return undefined
 
 **********************************************

code/nel/tools/3d/plugin_max/scripts/nel_assets_png_batched.ms

@@ -322,7 +322,7 @@ rollout assets_png_rollout "Properties"
 	-- To use this script
 	--	Include it in your script into the rollout at the beginning.
 	--	Implement a do_it function to do the job in your rollout.
-	--	The function should retun -1 if an arror occured, else the count of modification done
+	--	The function should retun -1 if an arror occurred, else the count of modification done
 	--	It the function returns <1, the project will not be overwritten
 
 	Group "Running properties"

code/nel/tools/3d/plugin_max/scripts/nel_assets_ps_batched.ms

@@ -105,7 +105,7 @@ rollout assets_ps_rollout "Properties"
 	-- To use this script
 	--	Include it in your script into the rollout at the beginning.
 	--	Implement a do_it function to do the job in your rollout.
-	--	The function should retun -1 if an arror occured, else the count of modification done
+	--	The function should retun -1 if an arror occurred, else the count of modification done
 	--	It the function returns <1, the project will not be overwritten
 
 	Group "Running properties"

code/nel/tools/3d/plugin_max/scripts/nel_assets_resave.ms

@@ -46,7 +46,7 @@ rollout assets_resave_rollout "Properties"
 	-- To use this script
 	--	Include it in your script into the rollout at the beginning.
 	--	Implement a do_it function to do the job in your rollout.
-	--	The function should retun -1 if an arror occured, else the count of modification done
+	--	The function should retun -1 if an arror occurred, else the count of modification done
 	--	It the function returns <1, the project will not be overwritten
 
 	Group "Running properties"

code/nel/tools/3d/plugin_max/scripts/nel_assets_resave_hard.ms

@@ -46,7 +46,7 @@ rollout assets_resave_rollout "Properties"
 	-- To use this script
 	--	Include it in your script into the rollout at the beginning.
 	--	Implement a do_it function to do the job in your rollout.
-	--	The function should retun -1 if an arror occured, else the count of modification done
+	--	The function should retun -1 if an arror occurred, else the count of modification done
 	--	It the function returns <1, the project will not be overwritten
 
 	Group "Running properties"

code/nel/tools/3d/plugin_max/scripts/nel_batched_mergesave.ms

@@ -3,7 +3,7 @@
 -- To use this script
 --	Include it in your script into the rollout at the beginning.
 --	Implement a do_it function to do the job in your rollout.
---	The function should retun -1 if an arror occured, else the count of modification done
+--	The function should retun -1 if an arror occurred, else the count of modification done
 --	It the function returns <1, the project will not be overwritten
 
 Group "Running properties"

code/nel/tools/3d/plugin_max/scripts/nel_batched_script.ms

@@ -3,7 +3,7 @@
 -- To use this script
 --	Include it in your script into the rollout at the beginning.
 --	Implement a do_it function to do the job in your rollout.
---	The function should retun -1 if an arror occured, else the count of modification done
+--	The function should retun -1 if an arror occurred, else the count of modification done
 --	It the function returns <1, the project will not be overwritten
 
 Group "Running properties"

code/nel/tools/3d/shapes_exporter/main.cpp

@@ -292,7 +292,7 @@ sint main(int argc, char **argv)
 			}
 			else
 			{
-				// an error occured, try to delete directory
+				// an error occurred, try to delete directory
 				nlwarning("can't export shape");
 				CFile::deleteDirectory(output_path);
 			}

code/nel/tools/3d/zone_check_bind/zone_check_bind.cpp

@@ -89,7 +89,7 @@ typedef CQuadGrid<CPatchVertexInfo>   TPVQuadGrid;
 
 /** Load the given zone (name without extension)
   * return a pointer to the zone, or NULL if not found
-  * Throw an exception if a read error occured
+  * Throw an exception if a read error occurred
   */
 static CZone *LoadZone(uint16 xPos, uint16 yPos, std::string zoneExt)
 {

code/nel/tools/build_gamedata/generators/max_exporter_scripts/shape.ms

@@ -375,7 +375,7 @@ fn runNelMaxExportSub inputMaxFile retryCount =
 				(
 					-- Error
 					nlerror("ERROR exporting '%PreGenFileExtension%': can't open the file " + inputMaxFile)
-					nlerror("FAIL Mysterious error occured")
+					nlerror("FAIL Mysterious error occurred")
 					NelForceQuitRightNow()
 				)
 			)

code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_footer.ms

@@ -91,7 +91,7 @@ catch
 (
 	-- Error
 	nlerror("ERROR Fatal error exporting '%PreGenFileExtension%' in folder %MaxSourceDirectory%")
-	nlerror("FAIL Fatal error occured")
+	nlerror("FAIL Fatal error occurred")
 	NelForceQuitRightNow()
 	removeRunningTag = false
 )
@@ -116,7 +116,7 @@ if (removeRunningTag) then
 )
 else
 (
-	nlerror("FAIL One or more issues occured")
+	nlerror("FAIL One or more issues occurred")
 	NelForceQuitRightNow()
 )
 

code/nel/tools/build_gamedata/processes/anim/maxscript/anim_export.ms

@@ -235,7 +235,7 @@ catch
 (
 	-- Error
 	nlerror("ERROR Fatal error exporting 'anim' in folder %MaxSourceDirectory%")
-	nlerror("FAIL Fatal error occured")
+	nlerror("FAIL Fatal error occurred")
 	NelForceQuitRightNow()
 	removeRunningTag = false
 )
@@ -260,7 +260,7 @@ if (removeRunningTag) then
 )
 else
 (
-	nlerror("FAIL One or more issues occured")
+	nlerror("FAIL One or more issues occurred")
 	NelForceQuitRightNow()
 )
 

code/nel/tools/build_gamedata/processes/clodbank/maxscript/clod_export.ms

@@ -292,7 +292,7 @@ catch
 (
 	-- Error
 	nlerror("ERROR Fatal error exporting 'clod' in folder %MaxSourceDirectory%")
-	nlerror("FAIL Fatal error occured")
+	nlerror("FAIL Fatal error occurred")
 	NelForceQuitRightNow()
 	removeRunningTag = false
 )
@@ -317,7 +317,7 @@ if (removeRunningTag) then
 )
 else
 (
-	nlerror("FAIL One or more issues occured")
+	nlerror("FAIL One or more issues occurred")
 	NelForceQuitRightNow()
 )
 

code/nel/tools/build_gamedata/processes/ig/maxscript/ig_export.ms

@@ -342,7 +342,7 @@ catch
 (
 	-- Error
 	nlerror("ERROR Fatal error exporting 'ig' in folder %MaxSourceDirectory%")
-	nlerror("FAIL Fatal error occured")
+	nlerror("FAIL Fatal error occurred")
 	NelForceQuitRightNow()
 	removeRunningTag = false
 )
@@ -367,7 +367,7 @@ if (removeRunningTag) then
 )
 else
 (
-	nlerror("FAIL One or more issues occured")
+	nlerror("FAIL One or more issues occurred")
 	NelForceQuitRightNow()
 )
 

code/nel/tools/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms

@@ -215,7 +215,7 @@ catch
 (
 	-- Error
 	nlerror("ERROR Fatal error exporting 'pacs_prim' in folder %MaxSourceDirectory%")
-	nlerror("FAIL Fatal error occured")
+	nlerror("FAIL Fatal error occurred")
 	NelForceQuitRightNow()
 	removeRunningTag = false
 )
@@ -240,7 +240,7 @@ if (removeRunningTag) then
 )
 else
 (
-	nlerror("FAIL One or more issues occured")
+	nlerror("FAIL One or more issues occurred")
 	NelForceQuitRightNow()
 )
 

code/nel/tools/build_gamedata/processes/rbank/maxscript/cmb_export.ms

@@ -227,7 +227,7 @@ catch
 (
 	-- Error
 	nlerror("ERROR Fatal error exporting 'cmb' in folder %MaxSourceDirectory%")
-	nlerror("FAIL Fatal error occured")
+	nlerror("FAIL Fatal error occurred")
 	NelForceQuitRightNow()
 	removeRunningTag = false
 )
@@ -252,7 +252,7 @@ if (removeRunningTag) then
 )
 else
 (
-	nlerror("FAIL One or more issues occured")
+	nlerror("FAIL One or more issues occurred")
 	NelForceQuitRightNow()
 )
 

code/nel/tools/build_gamedata/processes/shape/maxscript/shape_export.ms

@@ -451,7 +451,7 @@ fn runNelMaxExportSub inputMaxFile retryCount =
 				(
 					-- Error
 					nlerror("ERROR exporting 'shape': can't open the file " + inputMaxFile)
-					nlerror("FAIL Mysterious error occured")
+					nlerror("FAIL Mysterious error occurred")
 					NelForceQuitRightNow()
 				)
 			)
@@ -559,7 +559,7 @@ catch
 (
 	-- Error
 	nlerror("ERROR Fatal error exporting 'shape' in folder %MaxSourceDirectory%")
-	nlerror("FAIL Fatal error occured")
+	nlerror("FAIL Fatal error occurred")
 	NelForceQuitRightNow()
 	removeRunningTag = false
 )
@@ -584,7 +584,7 @@ if (removeRunningTag) then
 )
 else
 (
-	nlerror("FAIL One or more issues occured")
+	nlerror("FAIL One or more issues occurred")
 	NelForceQuitRightNow()
 )
 

code/nel/tools/build_gamedata/processes/veget/maxscript/veget_export.ms

@@ -282,7 +282,7 @@ catch
 (
 	-- Error
 	nlerror("ERROR Fatal error exporting 'veget' in folder %MaxSourceDirectory%")
-	nlerror("FAIL Fatal error occured")
+	nlerror("FAIL Fatal error occurred")
 	NelForceQuitRightNow()
 	removeRunningTag = false
 )
@@ -307,7 +307,7 @@ if (removeRunningTag) then
 )
 else
 (
-	nlerror("FAIL One or more issues occured")
+	nlerror("FAIL One or more issues occurred")
 	NelForceQuitRightNow()
 )
 

code/nel/tools/logic/logic_editor_dll/logic_editorDoc.h

@@ -53,7 +53,7 @@ public:
 	 * change a variable name (all it's occurence)
 	 * \param CString old the old name of the var (not a reference because we may delete the string when deleting the variable !!)
 	 * \param CString &newName the new name of the var
-	 * \return BOOL TRUE if the change has been made, FALSE if an error occured
+	 * \return BOOL TRUE if the change has been made, FALSE if an error occurred
 	 */
 	BOOL changeVarName( CString old, const CString &newName);
 
@@ -67,7 +67,7 @@ public:
 	 * change a counter name (all it's occurence)
 	 * \param CString old the old name of the counter
 	 * \param CString &newName the new name of the counter
-	 * \return BOOL TRUE if the change has been made, FALSE if an error occured
+	 * \return BOOL TRUE if the change has been made, FALSE if an error occurred
 	 */
 	BOOL changeCounterName( CString old, const CString &newName);
 
@@ -82,7 +82,7 @@ public:
 	 * change a condition name (all it's occurence)
 	 * \param CString old the old name of the condition
 	 * \param CString &newName the new name of the condition
-	 * \return BOOL TRUE if the change has been made, FALSE if an error occured
+	 * \return BOOL TRUE if the change has been made, FALSE if an error occurred
 	 */
 	BOOL changeConditionName( CString old, const CString &newName);
 
@@ -97,7 +97,7 @@ public:
 	 * change a state name (all it's occurence)
 	 * \param CString old the old name of the state
 	 * \param CString &newName the new name of the state
-	 * \return BOOL TRUE if the change has been made, FALSE if an error occured
+	 * \return BOOL TRUE if the change has been made, FALSE if an error occurred
 	 */
 	BOOL changeStateName( CString old, const CString &newName);
 

code/nel/tools/misc/crash_report/crash_report_widget.ui

@@ -20,7 +20,7 @@
    <item row="0" column="0" colspan="2">
     <widget class="QLabel" name="descrLabel">
      <property name="text">
-      <string>What were you doing when the crash occured?</string>
+      <string>What were you doing when the crash occurred?</string>
      </property>
     </widget>
    </item>

code/ryzom/client/src/bug_report/bug_reportDlg.cpp

@@ -548,7 +548,7 @@ void CBug_reportDlg::sendReport (bool withScreenshot)
 	}
 	else
 	{
-		MessageBox ("An error occured when sending the report. Report wasn't sent, look log.log for more info", "Error");
+		MessageBox ("An error occurred when sending the report. Report wasn't sent, look log.log for more info", "Error");
 	}
 
 }

code/ryzom/client/src/connection.cpp

@@ -902,7 +902,7 @@ void updateBGDownloaderUI()
 	}
 	if (prevSuccess != LuaBGDSuccessFlag)
 	{
-		nlwarning("Some scipt error occured");
+		nlwarning("Some scipt error occurred");
 	}
 }
 

code/ryzom/client/src/far_tp.cpp

@@ -362,7 +362,7 @@ void CLoginStateMachine::run()
 			}
 			else
 			{
-				// return to login menu if an error occured
+				// return to login menu if an error occurred
 				_CurrentState = st_login;
 			}
 

code/ryzom/client/src/fx_cl.cpp

@@ -205,7 +205,7 @@ void CFxCL::updateVisualPropertyPos(const NLMISC::TGameCycle &/* gameCycle */, c
 
 		if (_Instance.getPos() != prevPos)
 		{
-			// a move or init occured -> must update cluster system
+			// a move or init occurred -> must update cluster system
 			UGlobalPosition gPos;
 			if( _Primitive )
 			{

code/ryzom/client/src/interface_v3/input_handler_manager.h

@@ -88,7 +88,7 @@ public:
 	/**
 	 * read the input config file.
 	 * \param fileName : name of the config file
-	 * \return true if no error occured
+	 * \return true if no error occurred
 	 */
 	bool	readInputConfigFile(const std::string & fileName);
 

code/ryzom/client/src/login_patch.cpp

@@ -1897,7 +1897,7 @@ int CPatchManager::downloadProgressFunc(void *foo, double t, double d, double ul
 	if (d != t)
 	{
 		// In the case of progress = 1, don't update because, this will be called in case of error to signal the end of the download, though
-		// no download actually occured. Instead, we set progress to 1.f at the end of downloadWithCurl if everything went fine
+		// no download actually occurred. Instead, we set progress to 1.f at the end of downloadWithCurl if everything went fine
 		return validateProgress(foo, t, d, ultotal, ulnow);
 	}
 	return 0;

code/ryzom/client/src/network_connection.h

@@ -304,7 +304,7 @@ public:
 	/**
 	 * Connects to the front-end (using or not the login system, depending on what was specified at init())
 	 * \param result the message returned in case of an error
-	 * Returns true if no error occured.
+	 * Returns true if no error occurred.
 	 */
 	bool			connect(std::string &result);
 

code/ryzom/common/data_common/r2/r2_ui_property_sheet.lua

@@ -927,7 +927,7 @@ end
 ------------------------------------------------------------------------------------------------------------
 -- get a form from its name
 function r2:getForm(name)
-	assert(name) -- why is nam nil???
+	assert(name) -- why is name nil???
 	return getUI("ui:interface:r2ed_form_" .. name)
 end
 

code/ryzom/common/src/game_share/cst_loader.cpp

@@ -227,7 +227,7 @@ void CSTLoader::generateDerivedClasses(const std::list< std::pair<std::string, T
 					content += "new Bool(" + (*it_val);
 					break;
 				default:
-					content += "ERROR: unsuported type " + toString((uint)(*it_def).second) + "\n";
+					content += "ERROR: unsupported type " + toString((uint)(*it_def).second) + "\n";
 					break;
 			}
 			content += ");\n";

code/ryzom/common/src/game_share/mirror_prop_value.h

@@ -847,7 +847,7 @@ public:
 private:
 
 	/** The previous value known is stored. If we stored the timestamp instead, we could not see a change
-	 * if it occured after but at the same cycle as resetChangeFlag().
+	 * if it occurred after but at the same cycle as resetChangeFlag().
 	 */
 	T							_PreviousValue;
 };
@@ -911,7 +911,7 @@ public:
 private:
 
 	/** The previous value known is stored. If we stored the timestamp instead, we could not see a change
-	 * if it occured after but at the same cycle as resetChangeFlag().
+	 * if it occurred after but at the same cycle as resetChangeFlag().
 	 */
 	T							_PreviousValue;
 };

code/ryzom/common/src/game_share/persistent_data_tree.cpp

@@ -816,7 +816,7 @@ bool CPersistentDataTree::writeToPdr(CPersistentDataRecord& pdr) const
 		ok= _Child->getChildren()[i]->writeToPdr(pdr);
 	}
 
-	// if an error occured during write then clear out the result pdr and return false
+	// if an error occurred during write then clear out the result pdr and return false
 	if (!ok)
 		pdr.clear();
 

code/ryzom/common/src/game_share/seeds.cpp

@@ -30,7 +30,7 @@ typedef CSeeds::TBigUInt TBigUInt;
 static inline void addAndCheckOverFlow(TUInt &dest, TUInt src, TUInt &overflow)
 {
 	TBigUInt newValue = (TBigUInt) src + (TBigUInt) dest;
-	if (newValue > (TBigUInt) CSeeds::MaxUIntValue) // has an overflow occured ?
+	if (newValue > (TBigUInt) CSeeds::MaxUIntValue) // has an overflow occurred ?
 	{
 		dest= (TUInt) (newValue - (TBigUInt) CSeeds::MaxUIntValue);
 		overflow = (TUInt) CSeeds::MaxUIntValue;

code/ryzom/server/src/ags_test/command_event_manager.cpp

@@ -858,7 +858,7 @@ bool	CCommandEventManager::CScript::run()
 	CScriptNode::EState	state = Root->execute(Environment);
 	if (state == CScriptNode::Error)
 	{
-		nlwarning("[%s] An error occured in script, script ended", Name.c_str());
+		nlwarning("[%s] An error occurred in script, script ended", Name.c_str());
 		return false;
 	}
 	else if (state == CScriptNode::Ok)

code/ryzom/server/src/ai_service/script_compiler.cpp

@@ -1666,7 +1666,7 @@ void CSubRuleTracer::removeInvalidTracers()
 
 CSmartPtr<CSubRuleTracer> CSubRuleTracer::codifyTree()
 {
-	if (getHigherParent()==this) // an error occured.
+	if (getHigherParent()==this) // an error occurred.
 	{
 		bool errorAppened=false;
 		// Check.

code/ryzom/server/src/entities_game_service/cdb_group.h

@@ -96,7 +96,7 @@ public:
 	/**
 	 * Add a recipient.
 	 * - recipient must be ready for writing (e.g. at state 1 of above tutorial), because it will
-	 * be filled immediately with the modifications that occured before its arrival.
+	 * be filled immediately with the modifications that occurred before its arrival.
 	 * //Obsolete:
 	 * //- recipient must neither move in memory nor be removed between calls of addRecipient() and
 	 * //removeRecipient(). Beware with vectors and reallocation.

code/ryzom/server/src/entities_game_service/common_shard_callbacks.cpp

@@ -53,7 +53,7 @@ void cbStallShard( NLNET::CMessage& msgin, const std::string &serviceName, NLNET
 	msgin.serial( filename );
 
 	nlwarning("Backup service send Stall order when trying write %s file", filename.c_str() );
-	PlayerManager.broadcastMessage( 2, 0, 5, "Technical problem occured on the server,");
+	PlayerManager.broadcastMessage( 2, 0, 5, "Technical problem occurred on the server,");
 	PlayerManager.broadcastMessage( 2, 0, 5, "All non administrator accounts are disconnected immediately.");
 	PlayerManager.broadcastMessage( 2, 0, 5, "Customer Support is already working on it.");
 	PlayerManager.broadcastMessage( 2, 0, 5, "Sorry for any inconveniences.");

code/ryzom/server/src/entities_game_service/entities_game_service.cpp

@@ -1898,7 +1898,7 @@ void CPlayerService::release()
 //---------------------------------------------------
 void cbConnection( const std::string &serviceName, NLNET::TServiceId serviceId, void *arg )
 {
-	// inform player about the service event that occured
+	// inform player about the service event that occurred
 #if !FINAL_VERSION
 	PlayerManager.broadcastMessage( 1, 0, 0, string("System event : Service UP : ")+serviceName);
 #endif

code/ryzom/server/src/entities_game_service/entity_manager/entity_base.h

@@ -353,7 +353,7 @@ public:
 	 *	Set the value of a var
 	 * \param var is the name of the variable
 	 * \param value is the new value for the variable
-	 * \return true if the value has been set, false if an error occured
+	 * \return true if the value has been set, false if an error occurred
 	 */
 	bool setValue( const std::string& var, const std::string& value );
 
@@ -361,7 +361,7 @@ public:
 	 *	Modify the value of a var
 	 * \param var is the name of the variable
 	 * \param value is the modification value
-	 * \return true if the value has been changed, false if an error occured
+	 * \return true if the value has been changed, false if an error occurred
 	 */
 	bool modifyValue( const std::string& var, const std::string& value );
 

code/ryzom/server/src/entities_game_service/outpost_manager/outpost.h

@@ -317,9 +317,9 @@ public:
 	
 
 private:
-	/// an event affecting outpost state occured
+	/// an event affecting outpost state occurred
 	void eventTriggered(OUTPOSTENUMS::TOutpostEvent event, void* eventParams = NULL);
-	/// an event affecting outpost state occured and has not been handled
+	/// an event affecting outpost state occurred and has not been handled
 	/// WARNING: it should only be called from eventTriggered
 	void eventException(OUTPOSTENUMS::TOutpostEvent event, void* eventParams);
 	

code/ryzom/server/src/entities_game_service/phrase_manager/area_effect.h

@@ -114,7 +114,7 @@ public:
 			str = NLMISC::toString("Chain, max target %d, factor %f range %f", Chain.MaxTargets, Chain.Factor, Chain.Range);
 			break;
 		default:
-			str = "unkown area type";
+			str = "unknown area type";
 		};
 
 		return str;

code/ryzom/server/src/entities_game_service/player_manager/character.h

@@ -600,7 +600,7 @@ public:
 	 *	Set the value of a var
 	 * \param var is the name of the variable
 	 * \param value is the new value for the variable
-	 * \return true if the value has been set, false if an error occured
+	 * \return true if the value has been set, false if an error occurred
 	 */
 	bool setValue( std::string var, std::string value );
 
@@ -608,7 +608,7 @@ public:
 	 *	Modify the value of a var
 	 * \param var is the name of the variable
 	 * \param value is the modification value
-	 * \return true if the value has been changed, false if an error occured
+	 * \return true if the value has been changed, false if an error occurred
 	 */
 	bool modifyValue( std::string var, std::string value );
 	
@@ -2913,7 +2913,7 @@ private:
 	 * \param phraseId the phrase sheet id
 	 * \param knownPhraseIndex index of the phrase in phrase book
 	 * \param testRestrictions if true then test if player match phrase requirements
-	 * \return true if the phrase has been bought, false if an error occured
+	 * \return true if the phrase has been bought, false if an error occurred
 	 */
 	bool buyRolemasterPhrase( const NLMISC::CSheetId &phraseId, uint16 knownPhraseIndex, bool testRestrictions );
 
@@ -3839,7 +3839,7 @@ public:
 	/// Test the character against mission prerequisits for the specified list of mission giver NPCs
 	void			sendNpcMissionGiverIconDesc( const std::vector<uint32>& npcKeys );
 
-	/// Inform the client that an event that might change mission availability just occured
+	/// Inform the client that an event that might change mission availability just occurred
 	void			sendEventForMissionAvailabilityCheck();
 
 	/// Send the current timer period if is different from the default or force is true

code/ryzom/server/src/entities_game_service/player_manager/player_manager.cpp

@@ -2381,7 +2381,7 @@ void CPlayerManager::broadcastMessageUpdate()
 		else if( _Stall == true )
 		{
 			forceDisconnectUserWithoutPrivileges();
-			broadcastMessage( 2, 0, 5, "Technical problem occured on the server,");
+			broadcastMessage( 2, 0, 5, "Technical problem occurred on the server,");
 			broadcastMessage( 2, 0, 5, "All non administrator accounts are disconnected immediately.");
 			broadcastMessage( 2, 0, 5, "Customer Support is already working on it.");
 			broadcastMessage( 2, 0, 5, "Sorry for any inconveniences.");

code/ryzom/server/src/entities_game_service/pvp_manager/pvp_base.h

@@ -77,7 +77,7 @@ private:
 	///\name interface callbacks
 	//@{
 
-	/// callback when user potentially leaves PVP. Return false if an error occured
+	/// callback when user potentially leaves PVP. Return false if an error occurred
 	virtual bool leavePVP( CCharacter * user, IPVP::TEndType type) = 0;
 
 	/// callback when a player hurts another, does nothing by default

code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager.cpp

@@ -888,7 +888,7 @@ void CPVPManager::askForPVPChallenge( const NLMISC::CEntityId & userId )
 			++it;
 		}
 	}
-	// problem occured : bail out
+	// problem occurred : bail out
 	if ( problem )
 		return;
 	

code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.cpp

@@ -1418,7 +1418,7 @@ void CPVPManager2::askForDuel( const NLMISC::CEntityId & userId )
 			++it;
 		}
 	}
-	// problem occured : bail out
+	// problem occurred : bail out
 	if ( problem )
 		return;
 	

code/ryzom/server/src/frontend_service/vision_provider.cpp

@@ -364,7 +364,7 @@ bool				CVisionProvider::addPair( TClientId clientid, const TEntityIndex& entity
 	//TEMP
 	//flog.displayRawNL( "ADD C%hu E%u, slot %hu, id %s", clientid, entityindex, slot, CFrontEndPropertyReceiver::getEntity(entityindex)->id.toString().c_str() );
 
-	/* 1. Associate Entity Index to a new TCLEntityId (or get exiting association if this new association occured before a dissociation acknowledge from the client)
+	/* 1. Associate Entity Index to a new TCLEntityId (or get exiting association if this new association occurred before a dissociation acknowledge from the client)
 	 */
 
 	if ( slot < MAX_SEEN_ENTITIES_PER_CLIENT )

code/ryzom/server/src/input_output_service/string_manager_parser.cpp

@@ -620,7 +620,7 @@ bool CStringManager::parseBlock(const ucstring &block, CPhrase &phrase)
 					TParamId *pparamId;
 					if (!findParam(phrase, rep[k].ParamName, pparamId))
 					{
-						nlwarning("Text in clause %d use parameter [%s] that is unkown in block", count, rep[k].ParamName.c_str());
+						nlwarning("Text in clause %d use parameter [%s] that is unknown in block", count, rep[k].ParamName.c_str());
 						return false;
 					}
 				}

code/ryzom/server/src/mail_forum_service/hof_generator.cpp

@@ -269,7 +269,7 @@ void CHoFGenerator::processGenerationStep()
 		if (HoFVerbose.get())
 			nlwarning("script generation from '%s' failed for shard %u", getCurrentHDTFile().c_str(), getCurrentSDBReader().getShardId());
 
-		// skip the SDB reader if an error occured
+		// skip the SDB reader if an error occurred
 		setNextSDBReader();
 		return;
 	}

code/ryzom/server/src/persistant_data_service/pds_database.cpp

@@ -1587,7 +1587,7 @@ bool	CDatabase::buildDelta(const CTimestamp& starttime, const CTimestamp& endtim
 //			}
 //			catch (const Exception& e)
 //			{
-//				PDS_WARNING("buildDelta(): exception occured while saving straight log : %s", e.what());
+//				PDS_WARNING("buildDelta(): exception occurred while saving straight log : %s", e.what());
 //			}
 //		}
 //		else

code/ryzom/server/src/persistant_data_service/pds_table.h

@@ -315,14 +315,14 @@ public:
 
 		/**
 		 * Get data as a Set
-		 * Return an accessor on a set, which is valid only if not issue occured
+		 * Return an accessor on a set, which is valid only if not issue occurred
 		 * Thus, you are able to modify the list own your own, add/remove items...
 		 */
 		RY_PDS::CSetMap::CAccessor	getSet();
 
 		/**
 		 * Get data as a Set
-		 * Return an accessor on a set, which is valid only if not issue occured
+		 * Return an accessor on a set, which is valid only if not issue occurred
 		 */
 		const RY_PDS::CSetMap::CAccessor	getSet() const;
 

code/ryzom/server/src/persistant_data_service/pds_table_inline.h

@@ -630,7 +630,7 @@ inline bool	CTable::CDataAccessor::setIndex(const RY_PDS::CObjectIndex &index)
 
 /*
  * Get data as a Set
- * Return an accessor on a set, which is valid only if not issue occured
+ * Return an accessor on a set, which is valid only if not issue occurred
  * Thus, you are able to modify the list own your own, add/remove items...
  */
 inline RY_PDS::CSetMap::CAccessor	CTable::CDataAccessor::getSet()
@@ -655,7 +655,7 @@ inline RY_PDS::CSetMap::CAccessor	CTable::CDataAccessor::getSet()
 
 /*
  * Get data as a Set
- * Return an accessor on a set, which is valid only if not issue occured
+ * Return an accessor on a set, which is valid only if not issue occurred
  */
 inline const RY_PDS::CSetMap::CAccessor	CTable::CDataAccessor::getSet() const
 {

code/ryzom/server/src/shard_unifier_service/login_service.cpp

@@ -442,7 +442,7 @@ namespace LS
 			{
 				// invalid user !
 				nldebug("on_logout : invalid user %u", userId);
-				logoutResult(from, 1, "unkown user");
+				logoutResult(from, 1, "unknown user");
 				return;
 			}
 

code/ryzom/tools/client/ryzom_installer/src/downloader.cpp

@@ -186,7 +186,7 @@ void CDownloader::downloadFile()
 		if (m_listener)
 		{
 			QString error = qFromUtf8(NLMISC::formatErrorMessage(NLMISC::getLastError()));
-			m_listener->operationFail(tr("Error '%1' occured when trying to check free disk space on %2.").arg(error).arg(m_fullPath));
+			m_listener->operationFail(tr("Error '%1' occurred when trying to check free disk space on %2.").arg(error).arg(m_fullPath));
 		}
 		return;
 	}

code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp

@@ -137,7 +137,7 @@ void CInstallDialog::accept()
 	{
 		int error = NLMISC::getLastError();
 
-		nlwarning("Error '%s' (%d) occured when trying to check free disk space on %s, continue anyway", NLMISC::formatErrorMessage(error).c_str(), error, Q2C(m_dstDirectory));
+		nlwarning("Error '%s' (%d) occurred when trying to check free disk space on %s, continue anyway", NLMISC::formatErrorMessage(error).c_str(), error, Q2C(m_dstDirectory));
 	}
 
 	const CServer &server = CConfigFile::getInstance()->getServer();

code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp

@@ -130,7 +130,7 @@ void CMigrateDialog::accept()
 	{
 		int error = NLMISC::getLastError();
 
-		nlwarning("Error '%s' (%d) occured when trying to check free disk space on %s, continue anyway", NLMISC::formatErrorMessage(error).c_str(), error, Q2C(m_dstDirectory));
+		nlwarning("Error '%s' (%d) occurred when trying to check free disk space on %s, continue anyway", NLMISC::formatErrorMessage(error).c_str(), error, Q2C(m_dstDirectory));
 	}
 
 	// compare with exact size of current directory

code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts

@@ -854,7 +854,7 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende.</translation>
     </message>
     <message>
         <location filename="../src/main.cpp" line="119"/>
-        <source>Instalation and launcher tool for Ryzom</source>
+        <source>Installation and launcher tool for Ryzom</source>
         <translation>Installations- und Startprogramm für Ryzom</translation>
     </message>
     <message>

code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_es.ts

@@ -663,7 +663,7 @@ Just press Continue button and follow the different steps until everything is do
     </message>
     <message>
         <location filename="../src/main.cpp" line="119"/>
-        <source>Instalation and launcher tool for Ryzom</source>
+        <source>Installation and launcher tool for Ryzom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_fr.ts

@@ -865,7 +865,7 @@ Vous n'avez qu'à cliquer sur Suivant et suivre les différentes étap
     </message>
     <message>
         <location filename="../src/main.cpp" line="119"/>
-        <source>Instalation and launcher tool for Ryzom</source>
+        <source>Installation and launcher tool for Ryzom</source>
         <translation>Outil d&apos;installation et lanceur pour Ryzom</translation>
     </message>
     <message>

code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_ru.ts

@@ -831,7 +831,7 @@ Just press Continue button and follow the different steps until everything is do
     </message>
     <message>
         <location filename="../src/main.cpp" line="119"/>
-        <source>Instalation and launcher tool for Ryzom</source>
+        <source>Installation and launcher tool for Ryzom</source>
         <translation>Программа установки и запуска Ryzom</translation>
     </message>
     <message>

code/ryzom/tools/leveldesign/georges_dll/plugin_interface.h

@@ -128,7 +128,7 @@ public:
 	  *
 	  * \param dfnName is the name of the DFN. Can't be NULL.
 	  * \param pathName is the file name of the created document. Can be NULL.
-	  * \return the document pointer or NULL if a problem occured.
+	  * \return the document pointer or NULL if a problem occurred.
 	*/
 	virtual IEditDocument	*createDocument (const char *dfnName, const char *pathName) = 0;
 

code/ryzom/tools/leveldesign/variable_parser/lua_helper.h

@@ -80,7 +80,7 @@ public:
 	virtual std::string luaWhat() const throw() {return NLMISC::toString("LUAError: %s", what());}
 };
 
-// A parse error occured
+// A parse error occurred
 class ELuaParseError : public ELuaError
 {
 public:
@@ -107,7 +107,7 @@ protected:
 	std::string	_Reason;
 };
 
-// A execution error occured
+// A execution error occurred
 class ELuaExecuteError : public ELuaError
 {
 public:
@@ -118,7 +118,7 @@ public:
 	virtual std::string luaWhat() const throw() {return NLMISC::toString("ELuaExecuteError: %s", what());}
 };
 
-// A bad cast occured when using lua_checkcast
+// A bad cast occurred when using lua_checkcast
 class ELuaBadCast : public ELuaError
 {
 public:

code/ryzom/tools/scripts/linux/utilities

@@ -130,7 +130,7 @@ step()
 	fi
 }
 
-# call verify_steps() when you want to stop if error(s) occured in previous steps
+# call verify_steps() when you want to stop if error(s) occurred in previous steps
 verify_steps()
 {
     if [ $STEPS_FAILURES -eq 0 ]

code/studio/src/plugins/mission_compiler/mission_compiler_main_window.cpp

@@ -95,7 +95,7 @@ MissionCompilerMainWindow::MissionCompilerMainWindow(QWidget *parent) :
 	}
 	catch( NLMISC::Exception &e )
 	{
-		nlinfo( "Exception occured during Mission Compiler LIGO startup: %s", e.what() );
+		nlinfo( "Exception occurred during Mission Compiler LIGO startup: %s", e.what() );
 	}
 
 	NLLIGO::CPrimitiveContext::instance().CurrentLigoConfig = &m_ligoConfig;

code/web/public_php/ams/js/jquery.js

@@ -8097,7 +8097,7 @@ if ( jQuery.support.ajax ) {
 							xml;
 
 						// Firefox throws exceptions when accessing properties
-						// of an xhr when a network error occured
+						// of an xhr when a network error occurred
 						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
 						try {
 

code/web/public_php/ams/misc/elfinder-connector/elFinderVolumeMySQL.class.php

@@ -178,7 +178,7 @@ class elFinderVolumeMySQL extends elFinderVolumeDriver {
 
 	/**
 	 * Perform sql query and return result.
-	 * Increase sqlCnt and save error if occured
+	 * Increase sqlCnt and save error if occurred
 	 *
 	 * @param  string  $sql  query
 	 * @return misc

code/web/public_php/api/data/js/jquery-1.7.1.js

@@ -8111,7 +8111,7 @@ if ( jQuery.support.ajax ) {
 							xml;
 
 						// Firefox throws exceptions when accessing properties
-						// of an xhr when a network error occured
+						// of an xhr when a network error occurred
 						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
 						try {
 

code/web/public_php/webtt/cake/console/libs/tasks/plugin.php

@@ -108,7 +108,7 @@ class PluginTask extends Shell {
 		}
 
 		if (!$this->bake($plugin)) {
-			$this->err(sprintf(__("An error occured trying to bake: %s in %s", true), $plugin, $this->path . Inflector::underscore($pluginPath)));
+			$this->err(sprintf(__("An error occurred trying to bake: %s in %s", true), $plugin, $this->path . Inflector::underscore($pluginPath)));
 		}
 	}
 

code/web/public_php/webtt/cake/tests/cases/libs/controller/component.test.php

@@ -508,7 +508,7 @@ class ComponentTest extends CakeTestCase {
 		$Controller->constructClasses();
 		$Controller->Component->initialize($Controller);
 		$expected = array('setting' => array('itemx'), 'colour' => 'blood orange');
-		$this->assertEqual($Controller->Orange->settings, $expected, 'Params duplication has occured %s');
+		$this->assertEqual($Controller->Orange->settings, $expected, 'Params duplication has occurred %s');
 	}
 
 /**

code/web/public_php/webtt/cake/tests/cases/libs/controller/controller_merge_vars.test.php

@@ -155,7 +155,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
 		$Controller->constructClasses();
 
 		$expected = array('MergeVar' => array('flag', 'otherFlag', 'redirect' => false));
-		$this->assertEqual($Controller->components, $expected, 'Duplication of settings occured. %s');
+		$this->assertEqual($Controller->components, $expected, 'Duplication of settings occurred. %s');
 	}
 
 /**
@@ -182,7 +182,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
 		$Controller->constructClasses();
 
 		$expected = array('MergeVar' => array('format' => 'html', 'terse'));
-		$this->assertEqual($Controller->helpers, $expected, 'Duplication of settings occured. %s');
+		$this->assertEqual($Controller->helpers, $expected, 'Duplication of settings occurred. %s');
 	}
 
 /**